Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 12:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed amalgamated build. (#3546)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-01-10 09:39:37 -08:00
committed by GitHub
parent 79cc62a7ee
commit cded7e8d6c
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bgfx.cpp
View File

@@ -2734,8 +2734,12 @@ namespace bgfx
void* findModule(const char* _name) void* findModule(const char* _name)
{ {
#if BX_PLATFORM_WINDOWS #if BX_PLATFORM_WINDOWS
// NOTE: there was some reason to do it this way instead of simply calling GetModuleHandleA, if (NULL == _name
// but not sure what it was. || '\0' == *_name)
{
return GetModuleHandleA(NULL);
}
HANDLE process = GetCurrentProcess(); HANDLE process = GetCurrentProcess();
DWORD size; DWORD size;
BOOL result = EnumProcessModules(process BOOL result = EnumProcessModules(process

48
src/renderer_webgpu.cpp
View File

@@ -373,24 +373,24 @@ namespace bgfx { namespace wgpu
{ {
#define LANGUAGE_FEATURE(_name) WGPUWGSLLanguageFeatureName_##_name, #_name #define LANGUAGE_FEATURE(_name) WGPUWGSLLanguageFeatureName_##_name, #_name
{ LANGUAGE_FEATURE(ReadonlyAndReadwriteStorageTextures), true, false }, { LANGUAGE_FEATURE(ReadonlyAndReadwriteStorageTextures), true, false },
{ LANGUAGE_FEATURE(Packed4x8IntegerDotProduct), true, false }, { LANGUAGE_FEATURE(Packed4x8IntegerDotProduct), true, false },
{ LANGUAGE_FEATURE(UnrestrictedPointerParameters), true, false }, { LANGUAGE_FEATURE(UnrestrictedPointerParameters), true, false },
{ LANGUAGE_FEATURE(PointerCompositeAccess), true, false }, { LANGUAGE_FEATURE(PointerCompositeAccess), true, false },
{ LANGUAGE_FEATURE(UniformBufferStandardLayout), true, false }, { LANGUAGE_FEATURE(UniformBufferStandardLayout), true, false },
{ LANGUAGE_FEATURE(SubgroupId), true, false }, { LANGUAGE_FEATURE(SubgroupId), true, false },
{ LANGUAGE_FEATURE(ChromiumTestingUnimplemented), true, false }, { LANGUAGE_FEATURE(ChromiumTestingUnimplemented), true, false },
{ LANGUAGE_FEATURE(ChromiumTestingUnsafeExperimental), true, false }, { LANGUAGE_FEATURE(ChromiumTestingUnsafeExperimental), true, false },
{ LANGUAGE_FEATURE(ChromiumTestingExperimental), true, false }, { LANGUAGE_FEATURE(ChromiumTestingExperimental), true, false },
{ LANGUAGE_FEATURE(ChromiumTestingShippedWithKillswitch), true, false }, { LANGUAGE_FEATURE(ChromiumTestingShippedWithKillswitch), true, false },
{ LANGUAGE_FEATURE(ChromiumTestingShipped), true, false }, { LANGUAGE_FEATURE(ChromiumTestingShipped), true, false },
{ LANGUAGE_FEATURE(SizedBindingArray), true, false }, { LANGUAGE_FEATURE(SizedBindingArray), true, false },
{ LANGUAGE_FEATURE(TexelBuffers), true, false }, { LANGUAGE_FEATURE(TexelBuffers), true, false },
{ LANGUAGE_FEATURE(ChromiumPrint), true, false }, { LANGUAGE_FEATURE(ChromiumPrint), true, false },
{ LANGUAGE_FEATURE(FragmentDepth), true, false }, { LANGUAGE_FEATURE(FragmentDepth), true, false },
{ LANGUAGE_FEATURE(ImmediateAddressSpace), true, false }, { LANGUAGE_FEATURE(ImmediateAddressSpace), true, false },
{ LANGUAGE_FEATURE(SubgroupUniformity), true, false }, { LANGUAGE_FEATURE(SubgroupUniformity), true, false },
{ LANGUAGE_FEATURE(TextureAndSamplerLet), true, false }, { LANGUAGE_FEATURE(TextureAndSamplerLet), true, false },
#undef LANGUAGE_FEATURE #undef LANGUAGE_FEATURE
}; };
@@ -4602,10 +4602,6 @@ m_resolution.formatColor = TextureFormat::BGRA8;
} }
#endif // BX_PLATFORM_OSX || BX_PLATFORM_IOS || BX_PLATFORM_TVOS || BX_PLATFORM_VISIONOS #endif // BX_PLATFORM_OSX || BX_PLATFORM_IOS || BX_PLATFORM_TVOS || BX_PLATFORM_VISIONOS
#if BX_PLATFORM_WINDOWS
extern "C" void* __stdcall GetModuleHandleA(const char* _moduleName);
#endif // BX_PLATFORM_WINDOWS
bool SwapChainWGPU::createSurface(void* _nwh) bool SwapChainWGPU::createSurface(void* _nwh)
{ {
m_nwh = _nwh; m_nwh = _nwh;
@@ -4620,7 +4616,7 @@ extern "C" void* __stdcall GetModuleHandleA(const char* _moduleName);
.next = NULL, .next = NULL,
.sType = WGPUSType_SurfaceSourceWindowsHWND, .sType = WGPUSType_SurfaceSourceWindowsHWND,
}, },
.hinstance = GetModuleHandleA(NULL), .hinstance = findModule(""),
.hwnd = m_nwh, .hwnd = m_nwh,
}; };
@@ -4630,7 +4626,7 @@ extern "C" void* __stdcall GetModuleHandleA(const char* _moduleName);
.label = toWGPUStringView("SwapChainWGPU"), .label = toWGPUStringView("SwapChainWGPU"),
}; };
#elif BX_PLATFORM_LINUX #elif BX_PLATFORM_LINUX
WGPUSurfaceSourceXlibWindow sufraceSourceXlib = WGPUSurfaceSourceXlibWindow surfaceSourceXlib =
{ {
.chain = .chain =
{ {
@@ -4641,7 +4637,7 @@ extern "C" void* __stdcall GetModuleHandleA(const char* _moduleName);
.window = uint64_t(m_nwh), .window = uint64_t(m_nwh),
}; };
WGPUSurfaceSourceWaylandSurface sufraceSourceWayland = WGPUSurfaceSourceWaylandSurface surfaceSourceWayland =
{ {
.chain = .chain =
{ {
@@ -4655,8 +4651,8 @@ extern "C" void* __stdcall GetModuleHandleA(const char* _moduleName);
surfaceDesc = surfaceDesc =
{ {
.nextInChain = g_platformData.type == bgfx::NativeWindowHandleType::Wayland .nextInChain = g_platformData.type == bgfx::NativeWindowHandleType::Wayland
? &sufraceSourceWayland.chain ? &surfaceSourceWayland.chain
: &sufraceSourceXlib.chain : &surfaceSourceXlib.chain
, ,
.label = toWGPUStringView("SwapChainWGPU"), .label = toWGPUStringView("SwapChainWGPU"),
}; };