admin/AdvDebug-Brovan
1
0
Fork 0
mirror of https://github.com/AdvDebug/Brovan synced 2026-08-09 11:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix what codex mentioned

Browse Source
This commit is contained in:
AdvDebug
2026-07-06 17:03:55 +03:00
parent a779d2f508
commit a39ba0e928
5 changed files with 179 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Brovan.Generators/VulkanForwardGenerator.cs
+65 -9
View File
@@ -558,18 +558,72 @@ namespace Brovan.Generators
private static string EmitHostCase(Model m, Command c, int id)
{
if (c.Name == "vkCreateInstance")
return " case " + id + ":\n {\n" +
" uint hasCi = r.ReadU32();\n" +
" System.IntPtr ci = System.IntPtr.Zero;\n" +
" if (hasCi != 0) ci = BrovVulkGenStruct.Rebuild(19, r, st);\n" +
" uint hasAc = r.ReadU32();\n" +
" if (hasAc != 0) { System.IntPtr ac = BrovVulkGenStruct.Rebuild(0, r, st); *(System.IntPtr*)(ci + 24) = ac; }\n" +
" if (Brovan.GeneralHelper.IsLinux && ci != System.IntPtr.Zero)\n" +
" {\n" +
" uint extCount = *(uint*)(ci + 48);\n" +
" if (extCount > 1024) extCount = 1024;\n" +
" System.IntPtr extPtr = *(System.IntPtr*)(ci + 56);\n" +
" if (extCount != 0 && extPtr != System.IntPtr.Zero)\n" +
" {\n" +
" System.IntPtr newArr = st.Alloc(BrovVulkGenStruct.CheckedBytes(extCount, 8));\n" +
" uint newCount = 0;\n" +
" bool sawWin32 = false;\n" +
" for (uint k = 0; k < extCount; k++)\n" +
" {\n" +
" System.IntPtr p = System.Runtime.InteropServices.Marshal.ReadIntPtr(extPtr, (int)(k * 8));\n" +
" string name = p == System.IntPtr.Zero ? null : System.Runtime.InteropServices.Marshal.PtrToStringAnsi(p);\n" +
" if (name == \"VK_KHR_win32_surface\") { sawWin32 = true; continue; }\n" +
" System.Runtime.InteropServices.Marshal.WriteIntPtr(newArr, (int)(newCount * 8), p);\n" +
" newCount++;\n" +
" }\n" +
" if (sawWin32)\n" +
" {\n" +
" System.IntPtr xcbName = System.Runtime.InteropServices.Marshal.StringToHGlobalAnsi(\"VK_KHR_xcb_surface\");\n" +
" System.Runtime.InteropServices.Marshal.WriteIntPtr(newArr, (int)(newCount * 8), xcbName);\n" +
" newCount++;\n" +
" *(uint*)(ci + 48) = newCount;\n" +
" *(System.IntPtr*)(ci + 56) = newArr;\n" +
" }\n" +
" }\n" +
" }\n" +
" System.IntPtr vki = System.IntPtr.Zero;\n" +
" int rr = (int)BrovVulkApi.vkCreateInstance(ci, System.IntPtr.Zero, (System.IntPtr)(&vki));\n" +
" w.WriteU32(st.Register(vki, \"VkInstance\"));\n" +
" return rr;\n }\n";
if (c.Name == "vkCreateWin32SurfaceKHR")
return " case " + id + ":\n {\n" +
" System.IntPtr vi = st.Lookup(r.ReadU32(), \"VkInstance\");\n" +
" System.IntPtr hwnd = inst.WinHelper.EnsureHostWindowHandle();\n" +
" System.IntPtr hinst = BrovVulkGenNative.GetModuleHandleW(System.IntPtr.Zero);\n" +
" byte* ci = stackalloc byte[40];\n" +
" for (int z = 0; z < 40; z++) ci[z] = 0;\n" +
" *(int*)(ci + 0) = 1000009000;\n" +
" *(void**)(ci + 24) = (void*)hinst;\n" +
" *(void**)(ci + 32) = (void*)hwnd;\n" +
" System.IntPtr surf = System.IntPtr.Zero;\n" +
" int rr = (int)BrovVulkApi.vkCreateWin32SurfaceKHR(vi, (System.IntPtr)ci, System.IntPtr.Zero, (System.IntPtr)(&surf));\n" +
" int rr;\n" +
" if (Brovan.GeneralHelper.IsLinux)\n" +
" {\n" +
" System.IntPtr xdpy; System.IntPtr xwin;\n" +
" inst.WinHelper.EnsureHostXlibSurfaceHandles(out xdpy, out xwin);\n" +
" byte* ci = stackalloc byte[40];\n" +
" for (int z = 0; z < 40; z++) ci[z] = 0;\n" +
" *(int*)(ci + 0) = 1000005000;\n" +
" *(void**)(ci + 24) = (void*)xdpy;\n" +
" *(uint*)(ci + 32) = (uint)xwin;\n" +
" rr = (int)BrovVulkLinuxWsi.vkCreateXcbSurfaceKHR(vi, (System.IntPtr)ci, System.IntPtr.Zero, (System.IntPtr)(&surf));\n" +
" }\n" +
" else\n" +
" {\n" +
" System.IntPtr hwnd = inst.WinHelper.EnsureHostWindowHandle();\n" +
" System.IntPtr hinst = BrovVulkGenNative.GetModuleHandleW(System.IntPtr.Zero);\n" +
" byte* ci = stackalloc byte[40];\n" +
" for (int z = 0; z < 40; z++) ci[z] = 0;\n" +
" *(int*)(ci + 0) = 1000009000;\n" +
" *(void**)(ci + 24) = (void*)hinst;\n" +
" *(void**)(ci + 32) = (void*)hwnd;\n" +
" rr = (int)BrovVulkApi.vkCreateWin32SurfaceKHR(vi, (System.IntPtr)ci, System.IntPtr.Zero, (System.IntPtr)(&surf));\n" +
" }\n" +
" w.WriteU32(st.Register(surf, \"VkSurfaceKHR\"));\n" +
" return rr;\n }\n";
@@ -1112,6 +1166,7 @@ namespace Brovan.Generators
defB.Append("LIBRARY vulkan-1\nEXPORTS\n");
defB.Append("vkGetInstanceProcAddr\nvkGetDeviceProcAddr\n");
defB.Append("vkEnumerateInstanceExtensionProperties\nvkEnumerateInstanceLayerProperties\n");
defB.Append("vkEnumerateDeviceExtensionProperties\n");
pb.Append("#ifndef BROVVULK_GEN_PROTOS_H\n#define BROVVULK_GEN_PROTOS_H\n");
for (int i = 0; i < cmds.Count; i++)
{
@@ -1129,7 +1184,8 @@ namespace Brovan.Generators
pb.Append("VKAPI_ATTR ").Append(c.Ret).Append(" VKAPI_CALL ").Append(c.Name).Append("(").Append(GuestSig(c)).Append(");\n");
procB.Append("M(").Append(c.Name).Append(");\n");
if (c.Name != "vkGetInstanceProcAddr" && c.Name != "vkGetDeviceProcAddr"
&& c.Name != "vkEnumerateInstanceExtensionProperties" && c.Name != "vkEnumerateInstanceLayerProperties")
&& c.Name != "vkEnumerateInstanceExtensionProperties" && c.Name != "vkEnumerateInstanceLayerProperties"
&& c.Name != "vkEnumerateDeviceExtensionProperties")
defB.Append(c.Name).Append("\n");
}
pb.Append("#endif\n");
Brovan.Graphics/brovvulk-icd/vulkan_shim.c
+62 -4
View File
@@ -28,14 +28,37 @@ static HANDLE brov_dev(void)
return g_dev;
}
static const VkExtensionProperties g_InstanceExtensions[] =
{
{ "VK_KHR_surface", 25 },
{ "VK_KHR_win32_surface", 6 },
};
VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties(
const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties)
{
(void)pLayerName;
(void)pProperties;
if (pLayerName != NULL)
{
if (pPropertyCount)
*pPropertyCount = 0;
return VK_SUCCESS;
}
uint32_t total = (uint32_t)(sizeof(g_InstanceExtensions) / sizeof(g_InstanceExtensions[0]));
if (pProperties == NULL)
{
if (pPropertyCount)
*pPropertyCount = total;
return VK_SUCCESS;
}
uint32_t avail = pPropertyCount ? *pPropertyCount : 0;
uint32_t copy = avail < total ? avail : total;
if (copy > 0)
memcpy(pProperties, g_InstanceExtensions, copy * sizeof(VkExtensionProperties));
if (pPropertyCount)
*pPropertyCount = 0;
return VK_SUCCESS;
*pPropertyCount = copy;
return copy < total ? VK_INCOMPLETE : VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(
@@ -47,6 +70,40 @@ VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(
return VK_SUCCESS;
}
static const VkExtensionProperties g_DeviceExtensions[] =
{
{ "VK_KHR_swapchain", 70 },
};
VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties(
VkPhysicalDevice physicalDevice, const char *pLayerName,
uint32_t *pPropertyCount, VkExtensionProperties *pProperties)
{
(void)physicalDevice;
if (pLayerName != NULL)
{
if (pPropertyCount)
*pPropertyCount = 0;
return VK_SUCCESS;
}
uint32_t total = (uint32_t)(sizeof(g_DeviceExtensions) / sizeof(g_DeviceExtensions[0]));
if (pProperties == NULL)
{
if (pPropertyCount)
*pPropertyCount = total;
return VK_SUCCESS;
}
uint32_t avail = pPropertyCount ? *pPropertyCount : 0;
uint32_t copy = avail < total ? avail : total;
if (copy > 0)
memcpy(pProperties, g_DeviceExtensions, copy * sizeof(VkExtensionProperties));
if (pPropertyCount)
*pPropertyCount = copy;
return copy < total ? VK_INCOMPLETE : VK_SUCCESS;
}
#define BVK_HDR 8u
static BVK_TLS unsigned char *bvk_rq;
@@ -283,6 +340,7 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instan
M(vkGetDeviceProcAddr);
M(vkEnumerateInstanceExtensionProperties);
M(vkEnumerateInstanceLayerProperties);
M(vkEnumerateDeviceExtensionProperties);
#include "obj/generated/brovvulk_gen_procs.inc"
#undef M
Brovan/Core/Emulation/OS/Windows/Devices/BrovVulkLinuxWsi.cs
+16
View File
@@ -0,0 +1,16 @@
using System;
using System.Runtime.InteropServices;
namespace Brovan.Core.Emulation.OS.Windows
{
internal static class BrovVulkLinuxWsi
{
internal const int VkStructureTypeXcbSurfaceCreateInfoKHR = 1000005000;
[DllImport("vulkan-1.dll", EntryPoint = "vkCreateXcbSurfaceKHR", CallingConvention = CallingConvention.Winapi)]
internal static extern int vkCreateXcbSurfaceKHR(IntPtr instance, IntPtr pCreateInfo, IntPtr pAllocator, IntPtr pSurface);
[DllImport("libX11-xcb.so.1", EntryPoint = "XGetXCBConnection")]
internal static extern IntPtr XGetXCBConnection(IntPtr display);
}
}
Brovan/Core/Emulation/OS/Windows/WinSyscallsHelper.cs
+24
View File
@@ -3633,6 +3633,30 @@ namespace Brovan.Core.Emulation.OS.Windows
return DesktopWindow?.NativeHandle ?? IntPtr.Zero;
}
public void EnsureHostXlibSurfaceHandles(out IntPtr connection, out IntPtr window)
{
if (!GeneralHelper.IsLinux)
{
connection = IntPtr.Zero;
window = IntPtr.Zero;
return;
}
EnsureDesktopDisplay();
EnsureDesktopWindow();
if (DesktopDisplay == null || DesktopWindow == null)
{
connection = IntPtr.Zero;
window = IntPtr.Zero;
return;
}
IntPtr xDisplay = DesktopDisplay.NativeHandle;
connection = BrovVulkLinuxWsi.XGetXCBConnection(xDisplay);
window = DesktopWindow.NativeHandle;
}
private WinWindow GetTopLevelWindow()
{
for (int i = TopLevelWindows.Count - 1; i >= 0; i--)
Brovan/Core/Emulation/UnicornBinding/Native.cs
+12
View File
@@ -159,6 +159,18 @@ namespace Brovan.Core.Emulation
return handle;
}
if (string.Equals(LibName, "libX11-xcb.so.1", StringComparison.OrdinalIgnoreCase))
{
if (GeneralHelper.IsLinux)
{
if (NativeLibrary.TryLoad("libX11-xcb.so.1", out IntPtr xcbHandle))
return xcbHandle;
if (NativeLibrary.TryLoad("libX11-xcb.so", out xcbHandle))
return xcbHandle;
}
return IntPtr.Zero;
}
return IntPtr.Zero;
}
}