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

Fixed warnings about missing braces in array initialisation. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@356 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-08-27 12:17:47 +00:00
parent a8f5185ef0
commit 57c5cb12e9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ static int s_nMaxPixelInstructions;
static int s_nColorsChanged[2]; // 0 - regular colors, 1 - k colors
static int s_nTexDimsChanged[2], s_nIndTexMtxChanged = 0; //min, max
static bool s_bAlphaChanged, s_bZBiasChanged, s_bIndTexScaleChanged;
static float lastRGBAfull[2][4][4] = {0};
static float lastRGBAfull[2][4][4];
static u32 lastAlpha = 0;
static u32 lastTexDims[8]={0};
static u32 lastZBias = 0;

9
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
View File

@ -192,11 +192,10 @@ bool VertexShaderMngr::CompileVertexShader(VERTEXSHADER& vs, const char* pstrpro
return true;
}
// TODO: this array is misdeclared. Why teh f** does it go through the compilers?
const u16 s_mtrltable[16][2] = {0, 0, 0, 1, 1, 1, 0, 2,
2, 1, 0, 3, 1, 2, 0, 3,
3, 1, 0, 4, 1, 3, 0, 4,
2, 2, 0, 4, 1, 3, 0, 4};
const u16 s_mtrltable[16][2] = {{0, 0}, {0, 1}, {1, 1}, {0, 2},
{2, 1}, {0, 3}, {1, 2}, {0, 3},
{3, 1}, {0, 4}, {1, 3}, {0, 4},
{2, 2}, {0, 4}, {1, 3}, {0, 4}};
/// syncs the shader constant buffers with xfmem
void VertexShaderMngr::SetConstants(VERTEXSHADER& vs)