From 58058311f4112c11272a812439c86522b05f1fd4 Mon Sep 17 00:00:00 2001 From: death2droid Date: Thu, 7 May 2009 08:56:20 +0000 Subject: [PATCH] Fix some problems :) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3168 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/PixelShaderManager.h | 1 - Source/Plugins/Plugin_VideoOGL/Src/Config.h | 1 - Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h | 2 -- 3 files changed, 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h index 1b19d36f03..858c19a881 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.h +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.h @@ -40,7 +40,6 @@ public: static void SetDestAlpha(const ConstantAlpha& alpha); static void SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt); static void SetCustomTexScale(int texmapid, float x, float y); - static void SetCustomTexScale(int texmapid, float x, float y); static void SetZTextureBias(u32 bias); static void SetViewport(float* viewport); static void SetIndMatrixChanged(int matrixidx); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Config.h b/Source/Plugins/Plugin_VideoOGL/Src/Config.h index 6bb8e35fcc..a1cb92ea75 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Config.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Config.h @@ -84,7 +84,6 @@ struct Config // Utility bool bDumpTextures; - bool bHiresTextures; bool bHiresTextures; bool bDumpEFBTarget; bool bDumpFrames; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h index 267dc66d5a..e2f2c67625 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h @@ -107,7 +107,6 @@ class ConfigDialog : public wxDialog wxCheckBox *m_DstAlphaPass; wxCheckBox *m_DumpTextures; wxCheckBox *m_HiresTextures; - wxCheckBox *m_HiresTextures; wxCheckBox *m_DumpEFBTarget; wxCheckBox *m_DumpFrames; wxCheckBox *m_FreeLook; @@ -170,7 +169,6 @@ class ConfigDialog : public wxDialog ID_DUMPTEXTURES, ID_HIRESTEXTURES, - ID_HIRESTEXTURES, ID_DUMPEFBTARGET, ID_DUMPFRAMES, ID_FREELOOK,