From 7f00960a32f90519a61ea1c6771cdecab29adb3e Mon Sep 17 00:00:00 2001 From: omegadox Date: Sun, 26 Jul 2009 11:13:56 +0000 Subject: [PATCH] Log unknown fog types in Warn log, and tiny code cleanup. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3885 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 6 ++++-- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 871b64f3a6..1a6a6ccd08 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -914,7 +914,9 @@ static void WriteFog(char *&p) } switch (bpmem.fog.c_proj_fsel.fsel) - { + { + case 0: // TODO - No fog? + break; case 2: // linear // empty break; @@ -932,7 +934,7 @@ static void WriteFog(char *&p) WRITE(p, " fog = 1.0f - fog;\n"); WRITE(p, " fog = pow(2, -8.0f * fog * fog);\n"); break; - default: PanicAlert("Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel); + default: WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel); } if (enabled) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 732fc75fe3..6d3f360dae 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -110,11 +110,6 @@ static Common::Event s_swapResponseEvent; static volatile u32 s_efbAccessRequested = false; static Common::Event s_efbResponseEvent; -#if defined(HAVE_WX) && HAVE_WX - -#endif // HAVE_WX - - void GetDllInfo (PLUGIN_INFO* _PluginInfo) { _PluginInfo->Version = 0x0100;