Fix D3D12

CMakeLists.txt

@@ -44,6 +44,11 @@ if (MARATHON_RECOMP_ARCHITECTURE STREQUAL "x86_64" OR MARATHON_RECOMP_ARCHITECTU
     )
 endif()
 
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    # Normally only defined by Visual Studio, added for consistency
+    add_compile_definitions(_DEBUG)
+endif()
+
 add_subdirectory(${MARATHON_RECOMP_THIRDPARTY_ROOT})
 add_subdirectory(${MARATHON_RECOMP_TOOLS_ROOT})
 

MarathonRecomp/gpu/video.cpp

@@ -4036,23 +4036,25 @@ static RenderShader* GetOrLinkShader(GuestShader* guestShader, uint32_t specCons
                 assert(result);
 
                 guestShader->shader = g_device->createShader(decoded.data(), decoded.size(), "shaderMain", RenderShaderFormat::SPIRV);
-#ifdef _DEBUG
-                guestShader->shader->setName(fmt::format("{}:{:x}", guestShader->shaderCacheEntry->filename, guestShader->shaderCacheEntry->hash));
-#endif
                 break;
             }
             case Backend::D3D12:
             {
                 guestShader->shader = g_device->createShader(g_shaderCache.get() + guestShader->shaderCacheEntry->dxilOffset, 
                     guestShader->shaderCacheEntry->dxilSize, "shaderMain", RenderShaderFormat::DXIL);
+                break;
             }
             case Backend::METAL:
             {
                 guestShader->shader = g_device->createShader(g_shaderCache.get() + guestShader->shaderCacheEntry->airOffset,
-                guestShader->shaderCacheEntry->airSize, "shaderMain", RenderShaderFormat::METAL);
+                    guestShader->shaderCacheEntry->airSize, "shaderMain", RenderShaderFormat::METAL);
                 break;
             }
             }
+
+#ifdef _DEBUG
+            guestShader->shader->setName(fmt::format("{}:{:x}", guestShader->shaderCacheEntry->filename, guestShader->shaderCacheEntry->hash));
+#endif
         }
 
         return guestShader->shader.get();
@@ -4176,6 +4178,10 @@ static RenderShader* GetOrLinkShader(GuestShader* guestShader, uint32_t specCons
             }
 
             shader = linkedShader.get();
+
+#ifdef _DEBUG
+            guestShader->shader->setName(fmt::format("{}:{:x}", guestShader->shaderCacheEntry->filename, guestShader->shaderCacheEntry->hash));
+#endif
         }        
     }
 #endif