Fixed Android build.

This commit is contained in:
Бранимир Караџић
2025-10-23 12:39:42 -07:00
parent f3cab4d2d8
commit 89e24f1849
4 changed files with 49 additions and 47 deletions

View File

@@ -2621,6 +2621,54 @@ namespace bgfx
};
static_assert(BX_COUNTOF(s_rendererCreator) == RendererType::Count);
void* findModule(const char* _name)
{
#if BX_PLATFORM_WINDOWS
// NOTE: there was some reason to do it this way instead of simply calling GetModuleHandleA,
// but not sure what it was.
HANDLE process = GetCurrentProcess();
DWORD size;
BOOL result = EnumProcessModules(process
, NULL
, 0
, &size
);
if (0 != result)
{
HMODULE* modules = (HMODULE*)BX_STACK_ALLOC(size);
result = EnumProcessModules(process
, modules
, size
, &size
);
if (0 != result)
{
char moduleName[MAX_PATH];
for (uint32_t ii = 0, num = uint32_t(size/sizeof(HMODULE) ); ii < num; ++ii)
{
result = GetModuleBaseNameA(process
, modules[ii]
, moduleName
, BX_COUNTOF(moduleName)
);
if (0 != result
&& 0 == bx::strCmpI(_name, moduleName) )
{
return (void*)modules[ii];
}
}
}
}
#else
BX_UNUSED(_name);
#endif // BX_PLATFORM_WINDOWS
return NULL;
}
bool windowsVersionIs(Condition::Enum _op, uint32_t _version, uint32_t _build)
{
#if BX_PLATFORM_WINDOWS

View File

@@ -427,6 +427,7 @@ namespace bgfx
};
};
void* findModule(const char* _name);
bool windowsVersionIs(Condition::Enum _op, uint32_t _version, uint32_t _build = UINT32_MAX);
constexpr bool isShaderType(uint32_t _magic, char _type)

View File

@@ -17,52 +17,6 @@
namespace bgfx
{
void* findModule(const char* _name)
{
#if BX_PLATFORM_WINDOWS
// NOTE: there was some reason to do it this way instead of simply calling GetModuleHandleA,
// but not sure what it was.
HANDLE process = GetCurrentProcess();
DWORD size;
BOOL result = EnumProcessModules(process
, NULL
, 0
, &size
);
if (0 != result)
{
HMODULE* modules = (HMODULE*)BX_STACK_ALLOC(size);
result = EnumProcessModules(process
, modules
, size
, &size
);
if (0 != result)
{
char moduleName[MAX_PATH];
for (uint32_t ii = 0, num = uint32_t(size/sizeof(HMODULE) ); ii < num; ++ii)
{
result = GetModuleBaseNameA(process
, modules[ii]
, moduleName
, BX_COUNTOF(moduleName)
);
if (0 != result
&& 0 == bx::strCmpI(_name, moduleName) )
{
return (void*)modules[ii];
}
}
}
}
#else
BX_UNUSED(_name);
#endif // BX_PLATFORM_WINDOWS
return NULL;
}
pRENDERDOC_GetAPI RENDERDOC_GetAPI;
static RENDERDOC_API_1_1_2* s_renderDoc = NULL;
static void* s_renderDocDll = NULL;

View File

@@ -8,7 +8,6 @@
namespace bgfx
{
void* findModule(const char* _name);
void* loadRenderDoc();
void unloadRenderDoc(void*);
void renderDocTriggerCapture();