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

more warning fixes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@483 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-09-08 07:09:34 +00:00
parent 8201ead1d9
commit 7026025a2d
7 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp
View File

@ -169,7 +169,8 @@ void PixelShaderMngr::Cleanup()
bool PixelShaderMngr::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrprogram)
{
CGerror cgerr = cgGetError();
// todo: Should error be checked?
// CGerror cgerr = cgGetError();
char stropt[64];
sprintf(stropt, "MaxLocalParams=32,NumInstructionSlots=%d", s_nMaxPixelInstructions);
@ -237,7 +238,7 @@ void PixelShaderMngr::SetConstants(FRAGMENTSHADER& ps)
}
u32 newmask = 0;
for(u32 i = 0; i < bpmem.genMode.numtevstages+1; ++i) {
for(u32 i = 0; i < (u32)bpmem.genMode.numtevstages+1; ++i) {
if( bpmem.tevorders[i/2].getEnable(i&1) ) {
int texmap = bpmem.tevorders[i/2].getTexMap(i&1);
maptocoord[texmap] = bpmem.tevorders[i/2].getTexCoord(i&1);
@ -496,7 +497,7 @@ GLuint PixelShaderMngr::GetColorMatrixProgram()
void PixelShaderMngr::GetPixelShaderId(PixelShaderMngr::PIXELSHADERUID& uid)
{
u32 projtexcoords = 0;
for (u32 i = 0; i < bpmem.genMode.numtevstages+1; i++) {
for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages+1; i++) {
if( bpmem.tevorders[i/2].getEnable(i&1) ) {
int texcoord = bpmem.tevorders[i/2].getTexCoord(i&1);
if( xfregs.texcoords[texcoord].texmtxinfo.projection )
@ -520,7 +521,7 @@ void PixelShaderMngr::GetPixelShaderId(PixelShaderMngr::PIXELSHADERUID& uid)
int hdr = 3;
u32* pcurvalue = &uid.values[hdr];
for(u32 i = 0; i < bpmem.genMode.numtevstages+1; ++i) {
for(u32 i = 0; i < (u32)bpmem.genMode.numtevstages+1; ++i) {
TevStageCombiner::ColorCombiner &cc = bpmem.combiners[i].colorC;
TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[i].alphaC;
@ -534,7 +535,7 @@ void PixelShaderMngr::GetPixelShaderId(PixelShaderMngr::PIXELSHADERUID& uid)
pcurvalue+=2;
}
for(u32 i = 0; i < (bpmem.genMode.numtevstages+1)/2; ++i) {
for(u32 i = 0; i < ((u32)bpmem.genMode.numtevstages+1)/2; ++i) {
u32 val0, val1;
if( bpmem.tevorders[i].hex&0x40 ) val0 = bpmem.tevorders[i].hex&0x3ff;
else val0 = bpmem.tevorders[i].hex&0x380;