ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc warning fixes. 

One of the fixes in 
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp (for an uninitialized 
variable) looks like it could actually have real-world effects; someone 
familiar with the code should check that the fix is correct.



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3669 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
magumagu9 2009-07-03 23:53:20 +00:00
parent 3034a9fcfc
commit 3c41c4dacf
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
View File

@ -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));
}

4
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h
View File

@ -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

5
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -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;
}

1
Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.cpp
View File

@ -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

2
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
View File

@ -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;