piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed more compiler warnings in linux.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5170 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-03-07 22:48:37 +00:00
parent ff7da32c6b
commit beba3b7f5b
22 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
View File

@ -59,6 +59,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Clipper
{
float m_ViewOffset[3];
OutputVertexData ClippedVertices[18];
OutputVertexData *Vertices[21];
void Init()
{
for (int i = 0; i < 18; ++i)

5
Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h
View File

@ -35,11 +35,6 @@ namespace Clipper
bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface);
void PerspectiveDivide(OutputVertexData *vertex);
static float m_ViewOffset[3];
static OutputVertexData ClippedVertices[18];
static OutputVertexData *Vertices[21];
}

4
Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
View File

@ -124,7 +124,7 @@ void DumpEfb(const char* filename)
*(writePtr++) = sample[3];
}
bool result = SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
delete []data;
}
@ -144,7 +144,7 @@ void DumpDepth(const char* filename)
*(writePtr++) = 255;
}
bool result = SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
delete []data;
}

2
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h
View File

@ -149,7 +149,7 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line);
#if defined(_DEBUG) || defined(DEBUGFAST)
#define GL_REPORT_ERRORD() OpenGL_ReportGLError(__FUNCTION__, __FILE__, __LINE__)
#else
#define GL_REPORT_ERRORD() GL_NO_ERROR
#define GL_REPORT_ERRORD()
#endif
#endif // GLTEST ??

4
Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
View File

@ -32,6 +32,10 @@
namespace Rasterizer
{
Slope ZSlope;
Slope WSlope;
Slope ColorSlopes[2][4];
Slope TexSlopes[8][3];
s32 scissorLeft = 0;
s32 scissorTop = 0;

4
Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h
View File

@ -40,10 +40,6 @@ namespace Rasterizer
float GetValue(s32 x, s32 y) { return f0 + (dfdx * (x - x0)) + (dfdy * (y - y0)); }
};
static Slope ZSlope;
static Slope WSlope;
static Slope ColorSlopes[2][4];
static Slope TexSlopes[8][3];
}
#endif

2
Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
View File

@ -98,7 +98,7 @@ void Sample(float s, float t, float lod, u8 texmap, u8 *sample)
u8 *imageSrc = g_VideoInitialize.pGetMemoryPointer(imageBase);
bool linear = false;
if (lod > 0 && tm0.min_filter > 4 || lod <= 0 && tm0.mag_filter)
if ((lod > 0 && tm0.min_filter > 4) || (lod <= 0 && tm0.mag_filter))
linear = true;
if (linear)