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

Third patch by riccardom in 2157019 

This one fix warnings (I'm sure you guessed it)
and use u8 instead of char where it makes sense.
This commit is contained in:
yabause 2008-10-13 19:20:27 +00:00
parent c78ba6f6d1
commit 64f18427be
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
desmume/src/gfx3d.cpp
View File

@ -78,11 +78,11 @@ static ALIGN(16) float mtxTemporal[16];
static u32 mode = 0; static u32 mode = 0;
// Indexes for matrix loading/multiplication // Indexes for matrix loading/multiplication
static char ML4x4ind = 0; static u8 ML4x4ind = 0;
static char ML4x3_c = 0, ML4x3_l = 0; static u8 ML4x3_c = 0, ML4x3_l = 0;
static char MM4x4ind = 0; static u8 MM4x4ind = 0;
static char MM4x3_c = 0, MM4x3_l = 0; static u8 MM4x3_c = 0, MM4x3_l = 0;
static char MM3x3_c = 0, MM3x3_l = 0; static u8 MM3x3_c = 0, MM3x3_l = 0;
// Data for vertex submission // Data for vertex submission
static ALIGN(16) float coord[4] = {0.0, 0.0, 0.0, 0.0}; static ALIGN(16) float coord[4] = {0.0, 0.0, 0.0, 0.0};
@ -91,9 +91,9 @@ static u32 vtxFormat;
// Data for basic transforms // Data for basic transforms
static ALIGN(16) float trans[4] = {0.0, 0.0, 0.0, 0.0}; static ALIGN(16) float trans[4] = {0.0, 0.0, 0.0, 0.0};
static char transind = 0; static u8 transind = 0;
static ALIGN(16) float scale[4] = {0.0, 0.0, 0.0, 0.0}; static ALIGN(16) float scale[4] = {0.0, 0.0, 0.0, 0.0};
static char scaleind = 0; static u8 scaleind = 0;
//various other registers //various other registers
static int _t=0, _s=0; static int _t=0, _s=0;
@ -155,8 +155,6 @@ static void twiddleLists() {
} }
static BOOL flushPending = FALSE; static BOOL flushPending = FALSE;
static u32 flush_wbuffer;
static u32 flush_sortmode;
//------------------------------------------------------------ //------------------------------------------------------------
static void makeTables() { static void makeTables() {
@ -469,8 +467,6 @@ void gfx3d_glColor3b(unsigned long v)
static void SetVertex() static void SetVertex()
{ {
ALIGN(16) float coordTransformed[4] = { coord[0], coord[1], coord[2], 1 }; ALIGN(16) float coordTransformed[4] = { coord[0], coord[1], coord[2], 1 };
ALIGN(16) float coordProjected[4];
if (texCoordinateTransform == 3) if (texCoordinateTransform == 3)
{ {
last_s =((coord[0]*mtxCurrent[3][0] + last_s =((coord[0]*mtxCurrent[3][0] +
@ -879,7 +875,7 @@ signed long gfx3d_GetDirectionalMatrix (unsigned int index)
return (signed long)(mtxCurrent[2][(index)*(1<<12)]); return (signed long)(mtxCurrent[2][(index)*(1<<12)]);
} }
void gfx3d_glLightDirection_cache(int index) static void gfx3d_glLightDirection_cache(int index)
{ {
u32 v = lightDirection[index]; u32 v = lightDirection[index];
@ -1403,7 +1399,7 @@ void gfx3d_VBlankSignal()
gpu3D->NDS_3D_Render(); gpu3D->NDS_3D_Render();
} }
void gfx3d_Control_cache() static void gfx3d_Control_cache()
{ {
u32 v = control; u32 v = control;
@ -1441,17 +1437,15 @@ void gfx3d_Control(unsigned long v)
//-------------- //--------------
//other misc stuff //other misc stuff
void gfx3d_glGetMatrix(unsigned int mode, unsigned int index, float* dest) void gfx3d_glGetMatrix(unsigned int m_mode, int index, float* dest)
{ {
//int n;
if(index == -1) if(index == -1)
{ {
MatrixCopy(dest, mtxCurrent[mode]); MatrixCopy(dest, mtxCurrent[m_mode]);
return; return;
} }
MatrixCopy(dest, MatrixStackGetPos(&mtxStack[mode], index)); MatrixCopy(dest, MatrixStackGetPos(&mtxStack[m_mode], index));
} }
void gfx3d_glGetLightDirection(unsigned int index, unsigned int* dest) void gfx3d_glGetLightDirection(unsigned int index, unsigned int* dest)

2
desmume/src/gfx3d.h
View File

@ -189,7 +189,7 @@ void gfx3d_VBlankSignal();
void gfx3d_Control(unsigned long v); void gfx3d_Control(unsigned long v);
//other misc stuff //other misc stuff
void gfx3d_glGetMatrix(unsigned int mode, unsigned int index, float* dest); void gfx3d_glGetMatrix(unsigned int mode, int index, float* dest);
void gfx3d_glGetLightDirection(unsigned int index, unsigned int* dest); void gfx3d_glGetLightDirection(unsigned int index, unsigned int* dest);
void gfx3d_glGetLightColor(unsigned int index, unsigned int* dest); void gfx3d_glGetLightColor(unsigned int index, unsigned int* dest);