diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index 83757528e3..b8acf8aff2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -131,12 +131,12 @@ void GFXConfigDialogOGL::CloseClick(wxCommandEvent& WXUNUSED (event)) /////////////////////////////////////////////////////////////////////////////////////////////// // Add avaliable resolutions and other settings // --------------- -void GFXConfigDialogOGL::AddFSReso(char *reso) +void GFXConfigDialogOGL::AddFSReso(const char *reso) { arrayStringFor_FullscreenCB.Add(wxString::FromAscii(reso)); } -void GFXConfigDialogOGL::AddWindowReso(char *reso) +void GFXConfigDialogOGL::AddWindowReso(const char *reso) { arrayStringFor_WindowResolutionCB.Add(wxString::FromAscii(reso)); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h index 4885217a21..f5abf1b238 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h @@ -58,8 +58,8 @@ class GFXConfigDialogOGL : public wxDialog virtual ~GFXConfigDialogOGL(); void CloseClick(wxCommandEvent& event); - void AddFSReso(char *reso); - void AddWindowReso(char *reso); + void AddFSReso(const char *reso); + void AddWindowReso(const char *reso); void CreateGUIControls(); void GameIniLoad(); // Combo box lists, this one needs to be public diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 4ca2d6be6c..0d0f7270a5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -93,7 +93,6 @@ static FILE* f_pFrameDump; static int s_MSAASamples = 1; static int s_MSAACoverageSamples = 0; -static bool s_bHaveStencilBuffer = false; bool s_bHaveFramebufferBlit = false; // export to FramebufferManager.cpp static bool s_bHaveCoverageMSAA = false; static u32 s_blendMode; @@ -644,9 +643,6 @@ void ComputeBackbufferRectangle(TRectangle *rc) // The new width and height FloatGLWidth = FloatGLWidth * Ratio; FloatGLHeight = FloatGLHeight * Ratio; - // The new width and height ratio - float WidthRatio = ((float)FloatGLWidth) / 640.0; - float HeightRatio = ((float)FloatGLHeight) / 480.0; // Adjust the X and Y offset FloatXOffset = FloatXOffset - (IncreasedWidth / 2.0); FloatYOffset = FloatYOffset - (IncreasedHeight / 2.0); @@ -724,6 +720,7 @@ void Renderer::Swap(u32 xfbAddr, u32 srcWidth, u32 srcHeight, s32 yOffset) else { u_max = (float)xfbSource->texWidth; + v_min = 0.f; v_max = (float)xfbSource->texHeight; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.cpp index 12e6e7e913..06d1a4b306 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.cpp @@ -174,7 +174,6 @@ void Write32BitSwizzler(char*& p, u32 format) float blkW = (float)GetBlockWidthInTexels(format); float blkH = (float)GetBlockHeightInTexels(format); - float samples = (float)GetEncodedSampleCount(format); // 32 bit textures (RGBA8 and Z24) are store in 2 cache line increments diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index fde7e07e20..3db8a816f6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -158,7 +158,7 @@ void Shutdown() s_rgbToYuyvProgram.Destroy(); s_yuyvToRgbProgram.Destroy(); - for (int i = 0; i < NUM_ENCODING_PROGRAMS; i++) + for (unsigned int i = 0; i < NUM_ENCODING_PROGRAMS; i++) s_encodingPrograms[i].Destroy(); s_srcTexture = 0;