eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-06-03 10:27:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

GPU: Use correct logging category

Browse source
This commit is contained in:
Lucas Murray 2024-12-06 20:54:31 +11:00 • committed by Ethan Lee
parent 5229b520af
commit 9b82d46259
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/gpu/d3d12/SDL_gpu_d3d12.c
View file

@ -6619,7 +6619,7 @@ static bool D3D12_INTERNAL_CreateSwapchain(
(void **)&pParent); (void **)&pParent);
if (FAILED(res)) { if (FAILED(res)) {
SDL_LogWarn( SDL_LogWarn(
SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_CATEGORY_GPU,
"Could not get swapchain parent! Error Code: " HRESULT_FMT, "Could not get swapchain parent! Error Code: " HRESULT_FMT,
res); res);
} else { } else {
@ -6630,7 +6630,7 @@ static bool D3D12_INTERNAL_CreateSwapchain(
DXGI_MWA_NO_WINDOW_CHANGES); DXGI_MWA_NO_WINDOW_CHANGES);
if (FAILED(res)) { if (FAILED(res)) {
SDL_LogWarn( SDL_LogWarn(
SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_CATEGORY_GPU,
"MakeWindowAssociation failed! Error Code: " HRESULT_FMT, "MakeWindowAssociation failed! Error Code: " HRESULT_FMT,
res); res);
} }
@ -6723,7 +6723,7 @@ static bool D3D12_ClaimWindow(
SET_STRING_ERROR_AND_RETURN("Could not create swapchain, failed to claim window!", false) SET_STRING_ERROR_AND_RETURN("Could not create swapchain, failed to claim window!", false)
} }
} else { } else {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Window already claimed!"); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Window already claimed!");
return false; return false;
} }
} }
@ -6736,7 +6736,7 @@ static void D3D12_ReleaseWindow(
D3D12WindowData *windowData = D3D12_INTERNAL_FetchWindowData(window); D3D12WindowData *windowData = D3D12_INTERNAL_FetchWindowData(window);
if (windowData == NULL) { if (windowData == NULL) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Window already unclaimed!"); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Window already unclaimed!");
return; return;
} }
@ -7986,7 +7986,7 @@ static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
d3d12Dll = SDL_LoadObject(D3D12_DLL); d3d12Dll = SDL_LoadObject(D3D12_DLL);
if (d3d12Dll == NULL) { if (d3d12Dll == NULL) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "D3D12: Could not find " D3D12_DLL); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "D3D12: Could not find " D3D12_DLL);
return false; return false;
} }
@ -7994,7 +7994,7 @@ static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
d3d12Dll, d3d12Dll,
D3D12_CREATE_DEVICE_FUNC); D3D12_CREATE_DEVICE_FUNC);
if (D3D12CreateDeviceFunc == NULL) { if (D3D12CreateDeviceFunc == NULL) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "D3D12: Could not find function " D3D12_CREATE_DEVICE_FUNC " in " D3D12_DLL); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "D3D12: Could not find function " D3D12_CREATE_DEVICE_FUNC " in " D3D12_DLL);
SDL_UnloadObject(d3d12Dll); SDL_UnloadObject(d3d12Dll);
return false; return false;
} }
@ -8003,7 +8003,7 @@ static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
dxgiDll = SDL_LoadObject(DXGI_DLL); dxgiDll = SDL_LoadObject(DXGI_DLL);
if (dxgiDll == NULL) { if (dxgiDll == NULL) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "D3D12: Could not find " DXGI_DLL); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "D3D12: Could not find " DXGI_DLL);
return false; return false;
} }
@ -8011,7 +8011,7 @@ static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
dxgiDll, dxgiDll,
CREATE_DXGI_FACTORY1_FUNC); CREATE_DXGI_FACTORY1_FUNC);
if (CreateDXGIFactoryFunc == NULL) { if (CreateDXGIFactoryFunc == NULL) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "D3D12: Could not find function " CREATE_DXGI_FACTORY1_FUNC " in " DXGI_DLL); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "D3D12: Could not find function " CREATE_DXGI_FACTORY1_FUNC " in " DXGI_DLL);
SDL_UnloadObject(dxgiDll); SDL_UnloadObject(dxgiDll);
return false; return false;
} }
@ -8023,7 +8023,7 @@ static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
&D3D_IID_IDXGIFactory1, &D3D_IID_IDXGIFactory1,
(void **)&factory); (void **)&factory);
if (FAILED(res)) { if (FAILED(res)) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "D3D12: Could not create DXGIFactory"); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "D3D12: Could not create DXGIFactory");
SDL_UnloadObject(d3d12Dll); SDL_UnloadObject(d3d12Dll);
SDL_UnloadObject(dxgiDll); SDL_UnloadObject(dxgiDll);
return false; return false;
@ -8036,7 +8036,7 @@ static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
(void **)&factory4); (void **)&factory4);
if (FAILED(res)) { if (FAILED(res)) {
IDXGIFactory1_Release(factory); IDXGIFactory1_Release(factory);
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "D3D12: Failed to find DXGI1.4 support, required for DX12"); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "D3D12: Failed to find DXGI1.4 support, required for DX12");
SDL_UnloadObject(d3d12Dll); SDL_UnloadObject(d3d12Dll);
SDL_UnloadObject(dxgiDll); SDL_UnloadObject(dxgiDll);
return false; return false;
@ -8062,7 +8062,7 @@ static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
&adapter); &adapter);
} }
if (FAILED(res)) { if (FAILED(res)) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "D3D12: Failed to find adapter for D3D12Device"); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "D3D12: Failed to find adapter for D3D12Device");
IDXGIFactory1_Release(factory); IDXGIFactory1_Release(factory);
SDL_UnloadObject(d3d12Dll); SDL_UnloadObject(d3d12Dll);
SDL_UnloadObject(dxgiDll); SDL_UnloadObject(dxgiDll);
@ -8085,7 +8085,7 @@ static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
SDL_UnloadObject(dxgiDll); SDL_UnloadObject(dxgiDll);
if (FAILED(res)) { if (FAILED(res)) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "D3D12: Could not create D3D12Device with feature level " D3D_FEATURE_LEVEL_CHOICE_STR); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "D3D12: Could not create D3D12Device with feature level " D3D_FEATURE_LEVEL_CHOICE_STR);
return false; return false;
} }
@ -8101,7 +8101,7 @@ static void D3D12_INTERNAL_TryInitializeDXGIDebug(D3D12Renderer *renderer)
renderer->dxgidebug_dll = SDL_LoadObject(DXGIDEBUG_DLL); renderer->dxgidebug_dll = SDL_LoadObject(DXGIDEBUG_DLL);
if (renderer->dxgidebug_dll == NULL) { if (renderer->dxgidebug_dll == NULL) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Could not find " DXGIDEBUG_DLL); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Could not find " DXGIDEBUG_DLL);
return; return;
} }
@ -8109,18 +8109,18 @@ static void D3D12_INTERNAL_TryInitializeDXGIDebug(D3D12Renderer *renderer)
renderer->dxgidebug_dll, renderer->dxgidebug_dll,
DXGI_GET_DEBUG_INTERFACE_FUNC); DXGI_GET_DEBUG_INTERFACE_FUNC);
if (DXGIGetDebugInterfaceFunc == NULL) { if (DXGIGetDebugInterfaceFunc == NULL) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Could not load function: " DXGI_GET_DEBUG_INTERFACE_FUNC); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Could not load function: " DXGI_GET_DEBUG_INTERFACE_FUNC);
return; return;
} }
res = DXGIGetDebugInterfaceFunc(&D3D_IID_IDXGIDebug, (void **)&renderer->dxgiDebug); res = DXGIGetDebugInterfaceFunc(&D3D_IID_IDXGIDebug, (void **)&renderer->dxgiDebug);
if (FAILED(res)) { if (FAILED(res)) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Could not get IDXGIDebug interface"); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Could not get IDXGIDebug interface");
} }
res = DXGIGetDebugInterfaceFunc(&D3D_IID_IDXGIInfoQueue, (void **)&renderer->dxgiInfoQueue); res = DXGIGetDebugInterfaceFunc(&D3D_IID_IDXGIInfoQueue, (void **)&renderer->dxgiInfoQueue);
if (FAILED(res)) { if (FAILED(res)) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Could not get IDXGIInfoQueue interface"); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Could not get IDXGIInfoQueue interface");
} }
} }
#endif #endif
@ -8140,7 +8140,7 @@ static void D3D12_INTERNAL_TryInitializeD3D12Debug(D3D12Renderer *renderer)
res = D3D12GetDebugInterfaceFunc(D3D_GUID(D3D_IID_ID3D12Debug), (void **)&renderer->d3d12Debug); res = D3D12GetDebugInterfaceFunc(D3D_GUID(D3D_IID_ID3D12Debug), (void **)&renderer->d3d12Debug);
if (FAILED(res)) { if (FAILED(res)) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Could not get ID3D12Debug interface"); SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Could not get ID3D12Debug interface");
return; return;
} }