Merge branch 'master' into TemporaryHackishBranch

This commit is contained in:
LunaMoo committed 2019-05-12 00:27:39 +02:00
commit 0388992739
2 files changed
-2

No files matched your search

-1
View File
@@ -266,7 +266,6 @@ void FramebufferManagerD3D11::CompilePostShader() {
} else {
return;
}
I18NCategory *gr = GetI18NCategory("Graphics");
UINT flags = D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY;
std::vector<uint8_t> byteCode;
-1
View File
@@ -618,7 +618,6 @@ void FramebufferManagerVulkan::CompilePostShader() {
} else {
return;
}
I18NCategory *gr = GetI18NCategory("Graphics");
// TODO: Delete the old pipeline?