From 6e9cc44d20caf926c6de80131a468de172e441c6 Mon Sep 17 00:00:00 2001 From: "XTra.KrazzY" Date: Sat, 7 Mar 2009 18:08:34 +0000 Subject: [PATCH] Oops, committed something I didn't want to commit. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2602 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj | 2 +- Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp | 4 ++-- Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp | 4 ++-- Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj index 97305842af..fdcb0ca4ee 100644 --- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj +++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj @@ -1,7 +1,7 @@ GetBufferPointer(); hello += "\n\n"; hello += code; - //MessageBox(0, hello.c_str(), "Error assembling vertex shader", MB_ICONERROR); + MessageBox(0, hello.c_str(), "Error assembling vertex shader", MB_ICONERROR); vShader = 0; } else if (SUCCEEDED(hr)) @@ -86,7 +86,7 @@ LPDIRECT3DPIXELSHADER9 CompilePixelShader(const char *code, int len, bool assemb std::string hello = (char*)errorBuffer->GetBufferPointer(); hello += "\n\n"; hello += code; - //MessageBox(0, hello.c_str(), "Error assembling pixel shader", MB_ICONERROR); + MessageBox(0, hello.c_str(), "Error assembling pixel shader", MB_ICONERROR); pShader = 0; } else diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index 1b456c849c..4fb7b82ef1 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -99,8 +99,8 @@ void PixelShaderCache::SetShader() INCSTAT(stats.numPixelShadersCreated); SETSTAT(stats.numPixelShadersAlive, (int)PixelShaders.size()); - } else; - //PanicAlert("Failed to compile Pixel Shader:\n\n%s", code); + } else + PanicAlert("Failed to compile Pixel Shader:\n\n%s", code); } LPDIRECT3DPIXELSHADER9 PixelShaderCache::CompileCgShader(const char *pstrprogram) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp index d9352d3eb6..e9aa4aff73 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp @@ -101,7 +101,7 @@ void VertexShaderCache::SetShader(u32 components) INCSTAT(stats.numVertexShadersCreated); SETSTAT(stats.numVertexShadersAlive, (int)vshaders.size()); } else { - //PanicAlert("Failed to compile Vertex Shader:\n\n%s", code); + PanicAlert("Failed to compile Vertex Shader:\n\n%s", code); } D3D::dev->SetFVF(NULL);