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

Silence gcc warnings about empty statements and out-of-order initializers. 

Increase ISO properties window size to make room for the new Gecko codes.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6050 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-08-04 14:00:59 +00:00
parent e9424bcafa
commit 7ddf0aa711
8 changed files with 197 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -36,7 +36,7 @@
#include "../../Common/Src/OpenCL.h"
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#include <ApplicationServices/ApplicationServices.h>
#endif
extern CFrame* main_frame;

4
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -524,9 +524,9 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sMain = new wxBoxSizer(wxVERTICAL);
sMain->Add(m_Notebook, 1, wxEXPAND|wxALL, 5);
sMain->Add(sButtons, 0, wxEXPAND, 5);
sMain->SetMinSize(wxSize(400, 600));
sMain->SetMinSize(wxSize(550, 600));
m_Notebook->SetMaxSize(wxSize(400, 600));
m_Notebook->SetMaxSize(wxSize(550, 600));
SetSizerAndFit(sMain);
}

2
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.h
View File

@ -32,9 +32,9 @@ class IUCode
public:
IUCode(CMailHandler& _rMailHandler)
: m_rMailHandler(_rMailHandler)
, m_UploadSetupInProgress(false)
, m_NextUCode()
, m_NextUCode_steps(0)
, m_UploadSetupInProgress(false)
, m_NeedsResumeMail(false)
{}

12
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -117,15 +117,15 @@ GLuint OpenGL_ReportGLError(const char *function, const char *file, int line);
bool OpenGL_ReportFBOError(const char *function, const char *file, int line);
#if defined(_DEBUG) || defined(DEBUGFAST)
#define GL_REPORT_ERROR() OpenGL_ReportGLError (__FUNCTION__, __FILE__, __LINE__)
#define GL_REPORT_PROGRAM_ERROR() OpenGL_ReportARBProgramError()
#define GL_REPORT_FBO_ERROR() OpenGL_ReportFBOError (__FUNCTION__, __FILE__, __LINE__)
#define GL_REPORT_ERROR() OpenGL_ReportGLError(__FUNCTION__, __FILE__, __LINE__)
#define GL_REPORT_ERRORD() OpenGL_ReportGLError(__FUNCTION__, __FILE__, __LINE__)
#define GL_REPORT_FBO_ERROR() OpenGL_ReportFBOError(__FUNCTION__, __FILE__, __LINE__)
#define GL_REPORT_PROGRAM_ERROR() OpenGL_ReportARBProgramError()
#else
#define GL_REPORT_ERROR() GL_NO_ERROR
#define GL_REPORT_PROGRAM_ERROR()
#define GL_REPORT_FBO_ERROR()
#define GL_REPORT_ERRORD()
#define GL_REPORT_ERRORD() (void)GL_NO_ERROR
#define GL_REPORT_FBO_ERROR() (void)true
#define GL_REPORT_PROGRAM_ERROR() (void)0
#endif
#if defined __APPLE__ || defined __linux__ || defined _WIN32

6
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
View File

@ -144,7 +144,7 @@ void AddVertices(int primitive, int numvertices)
{
if (numvertices <= 0)
return;
GL_REPORT_ERROR();
(void)GL_REPORT_ERROR();
switch (primitive)
{
case GX_DRAW_QUADS:
@ -233,9 +233,7 @@ void Flush()
DVSTARTPROFILE();
GL_REPORT_ERROR();
(void)GL_REPORT_ERROR();
glBindBuffer(GL_ARRAY_BUFFER, s_vboBuffers[s_nCurVBOIndex]);
glBufferData(GL_ARRAY_BUFFER, s_pCurBufferPointer - LocalVBuffer, LocalVBuffer, GL_STREAM_DRAW);