mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-07 03:13:49 +00:00
Fix code analizer's warning.
This commit is contained in:
parent
06c7877208
commit
df4c34bc2c
|
@ -593,7 +593,7 @@ void ShaderCombiner::_locateUniforms() {
|
||||||
if (config.generalEmulation.enableHWLighting) {
|
if (config.generalEmulation.enableHWLighting) {
|
||||||
// locate lights uniforms
|
// locate lights uniforms
|
||||||
char buf[32];
|
char buf[32];
|
||||||
for (u32 i = 0; i < 8; ++i) {
|
for (s32 i = 0; i < 8; ++i) {
|
||||||
sprintf(buf, "uLightDirection[%d]", i);
|
sprintf(buf, "uLightDirection[%d]", i);
|
||||||
m_uniforms.uLightDirection[i].loc = glGetUniformLocation(m_program, buf);
|
m_uniforms.uLightDirection[i].loc = glGetUniformLocation(m_program, buf);
|
||||||
sprintf(buf, "uLightColor[%d]", i);
|
sprintf(buf, "uLightColor[%d]", i);
|
||||||
|
|
|
@ -1077,7 +1077,7 @@ void OGLRender::drawTexturedRect(const TexturedRectParams & _params)
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
float s0, t0, s1, t1;
|
float s0, t0, s1, t1;
|
||||||
} texST[2]; //struct for texture coordinates
|
} texST[2] = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; //struct for texture coordinates
|
||||||
|
|
||||||
if (currentCombiner()->usesT0() && cache.current[0] && gSP.textureTile[0]) {
|
if (currentCombiner()->usesT0() && cache.current[0] && gSP.textureTile[0]) {
|
||||||
texST[0].s0 = _params.uls * cache.current[0]->shiftScaleS - gSP.textureTile[0]->fuls;
|
texST[0].s0 = _params.uls * cache.current[0]->shiftScaleS - gSP.textureTile[0]->fuls;
|
||||||
|
|
|
@ -940,11 +940,11 @@ void TextureCache::_load(u32 _tile, CachedTexture *_pTexture)
|
||||||
if (wid_64 & 15) wid_64 += 16;
|
if (wid_64 & 15) wid_64 += 16;
|
||||||
wid_64 &= 0xFFFFFFF0;
|
wid_64 &= 0xFFFFFFF0;
|
||||||
wid_64 >>= 3;
|
wid_64 >>= 3;
|
||||||
int line = tmptex.line << 1;
|
int line32 = tmptex.line << 1;
|
||||||
line = (line - wid_64) << 3;
|
line32 = (line32 - wid_64) << 3;
|
||||||
if (wid_64 < 1) wid_64 = 1;
|
if (wid_64 < 1) wid_64 = 1;
|
||||||
int width = wid_64 << 1;
|
int width = wid_64 << 1;
|
||||||
line = width + (line >> 2);
|
line32 = width + (line32 >> 2);
|
||||||
|
|
||||||
u16 gr, ab;
|
u16 gr, ab;
|
||||||
|
|
||||||
|
@ -954,7 +954,7 @@ void TextureCache::_load(u32 _tile, CachedTexture *_pTexture)
|
||||||
if (y & mirrorTBit)
|
if (y & mirrorTBit)
|
||||||
ty ^= maskTMask;
|
ty ^= maskTMask;
|
||||||
|
|
||||||
u32 tline = tbase + line * ty;
|
u32 tline = tbase + line32 * ty;
|
||||||
u32 xorval = (ty & 1) ? 3 : 1;
|
u32 xorval = (ty & 1) ? 3 : 1;
|
||||||
|
|
||||||
for (x = 0; x < tmptex.realWidth; ++x) {
|
for (x = 0; x < tmptex.realWidth; ++x) {
|
||||||
|
|
|
@ -8,10 +8,10 @@
|
||||||
EXTERN_C IMAGE_DOS_HEADER __ImageBase;
|
EXTERN_C IMAGE_DOS_HEADER __ImageBase;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
BOOL CALLBACK FindToolBarProc( HWND hWnd, LPARAM lParam )
|
BOOL CALLBACK FindToolBarProc( HWND _hWnd, LPARAM lParam )
|
||||||
{
|
{
|
||||||
if (GetWindowLong( hWnd, GWL_STYLE ) & RBS_VARHEIGHT) {
|
if (GetWindowLong( _hWnd, GWL_STYLE ) & RBS_VARHEIGHT) {
|
||||||
hToolBar = hWnd;
|
hToolBar = _hWnd;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -35,6 +35,7 @@ void PluginAPI::FindPluginPath(wchar_t * _strPath)
|
||||||
return;
|
return;
|
||||||
#ifdef OS_WINDOWS
|
#ifdef OS_WINDOWS
|
||||||
TCHAR strDLLPath[PLUGIN_PATH_SIZE];
|
TCHAR strDLLPath[PLUGIN_PATH_SIZE];
|
||||||
|
memset(strDLLPath, 0, sizeof(strDLLPath));
|
||||||
::GetModuleFileName((HINSTANCE)&__ImageBase, strDLLPath, PLUGIN_PATH_SIZE);
|
::GetModuleFileName((HINSTANCE)&__ImageBase, strDLLPath, PLUGIN_PATH_SIZE);
|
||||||
::mbstowcs(_strPath, strDLLPath, PLUGIN_PATH_SIZE);
|
::mbstowcs(_strPath, strDLLPath, PLUGIN_PATH_SIZE);
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue
Block a user