dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-07 15:53:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include "Hash.h" rather than "hash.h" for case-sensitive file systems.

Browse Source 
Fix some compiler warnings.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6141 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-08-28 15:53:01 +00:00
parent ae802f0403
commit 1d05290be7
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
View File

@ -50,8 +50,8 @@ void Jit64::lXXx(UGeckoInstruction inst)
{ Default(inst); return; } { Default(inst); return; }
// Determine memory access size and sign extend // Determine memory access size and sign extend
int accessSize; int accessSize = 0;
bool signExtend; bool signExtend = false;
switch (inst.OPCD) switch (inst.OPCD)
{ {
case 32: /* lwz */ case 32: /* lwz */

2
Source/Core/VideoCommon/Src/TextureDecoder.h
View File

@ -17,7 +17,7 @@
#ifndef _TEXTUREDECODER_H #ifndef _TEXTUREDECODER_H
#define _TEXTUREDECODER_H #define _TEXTUREDECODER_H
#include "hash.h" #include "Hash.h"
enum enum
{ {
TMEM_SIZE = 1024*1024, TMEM_SIZE = 1024*1024,

10
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
View File

@ -240,7 +240,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
if (components & (VB_HAS_COL0 << j)) if (components & (VB_HAS_COL0 << j))
WRITE(p, "mat = color%d;\n", j); WRITE(p, "mat = color%d;\n", j);
else if (components & VB_HAS_COL0) else if (components & VB_HAS_COL0)
WRITE(p, "mat = color0;\n", j); WRITE(p, "mat = color0;\n");
else else
WRITE(p, "mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); WRITE(p, "mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
} }
@ -252,7 +252,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
if (components & (VB_HAS_COL0<<j) ) if (components & (VB_HAS_COL0<<j) )
WRITE(p, "lacc = color%d;\n", j); WRITE(p, "lacc = color%d;\n", j);
else if (components & VB_HAS_COL0 ) else if (components & VB_HAS_COL0 )
WRITE(p, "lacc = color0;\n", j); WRITE(p, "lacc = color0;\n");
else else
WRITE(p, "lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n"); WRITE(p, "lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
} }
@ -270,7 +270,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
if (components & (VB_HAS_COL0<<j)) if (components & (VB_HAS_COL0<<j))
WRITE(p, "mat.w = color%d.w;\n", j); WRITE(p, "mat.w = color%d.w;\n", j);
else if (components & VB_HAS_COL0) else if (components & VB_HAS_COL0)
WRITE(p, "mat.w = color0.w;\n", j); WRITE(p, "mat.w = color0.w;\n");
else WRITE(p, "mat.w = 1.0f;\n"); else WRITE(p, "mat.w = 1.0f;\n");
} }
else // from color else // from color
@ -283,7 +283,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
if (components & (VB_HAS_COL0<<j) ) if (components & (VB_HAS_COL0<<j) )
WRITE(p, "lacc.w = color%d.w;\n", j); WRITE(p, "lacc.w = color%d.w;\n", j);
else if (components & VB_HAS_COL0 ) else if (components & VB_HAS_COL0 )
WRITE(p, "lacc.w = color0.w;\n", j); WRITE(p, "lacc.w = color0.w;\n");
else else
WRITE(p, "lacc.w = 0.0f;\n"); WRITE(p, "lacc.w = 0.0f;\n");
} }
@ -533,7 +533,7 @@ char *GenerateLightShader(char *p, int index, const LitChannel& chan, const char
else if (chan.attnfunc == 1) else if (chan.attnfunc == 1)
{ // specular { // specular
WRITE(p, "ldir = normalize("I_LIGHTS".lights[%d].pos.xyz);\n",index); WRITE(p, "ldir = normalize("I_LIGHTS".lights[%d].pos.xyz);\n",index);
WRITE(p, "attn = (dot(_norm0,ldir) > 0.0f) ? max(0.0f, dot(_norm0, "I_LIGHTS".lights[%d].dir.xyz)) : 0.0f;\n", index, index); WRITE(p, "attn = (dot(_norm0,ldir) > 0.0f) ? max(0.0f, dot(_norm0, "I_LIGHTS".lights[%d].dir.xyz)) : 0.0f;\n", index);
WRITE(p, "attn = max(0.0f, dot("I_LIGHTS".lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot("I_LIGHTS".lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", index, index); WRITE(p, "attn = max(0.0f, dot("I_LIGHTS".lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot("I_LIGHTS".lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", index, index);
} }

8
Source/Plugins/Plugin_VideoOGL/Src/DLCache.cpp
View File

@ -200,9 +200,9 @@ bool AnalyzeAndRunDisplayList(u32 address, int size, CachedDisplayList *dl)
break; break;
case GX_CMD_CALL_DL: case GX_CMD_CALL_DL:
{ {
u32 address = DataReadU32(); u32 addr = DataReadU32();
u32 count = DataReadU32(); u32 count = DataReadU32();
ExecuteDisplayList(address, count); ExecuteDisplayList(addr, count);
} }
break; break;
case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that
@ -359,9 +359,9 @@ bool CompileAndRunDisplayList(u32 address, int size, CachedDisplayList *dl)
case GX_CMD_CALL_DL: case GX_CMD_CALL_DL:
{ {
u32 address = DataReadU32(); u32 addr= DataReadU32();
u32 count = DataReadU32(); u32 count = DataReadU32();
ExecuteDisplayList(address, count); ExecuteDisplayList(addr, count);
emitter.ABI_CallFunctionCC((void *)&ExecuteDisplayList, address, count); emitter.ABI_CallFunctionCC((void *)&ExecuteDisplayList, address, count);
} }
break; break;

2
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/MatrixMath.h
View File

@ -81,4 +81,4 @@ inline void MatrixTransformVertex(Matrix const & m, Vertex & v)
} }
} }
#endif #endif

2
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.cpp
View File

@ -632,7 +632,7 @@ void Wiimote::Update()
// IR // IR
if (rptf.ir) if (rptf.ir)
GetIRData(data + rptf.ir, (rptf.accel!=NULL)); GetIRData(data + rptf.ir, (rptf.accel != 0));
// extension // extension
if (rptf.ext) if (rptf.ext)