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

stb and stbu do not work under 64bit Linux, re-disabling 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1293 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2008-11-25 10:48:07 +00:00
parent 8e0823bf37
commit 29faf7776b
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,6 +373,14 @@ namespace Jit64
#endif*/ #endif*/
//Still here? Do regular path. //Still here? Do regular path.
// NOTE: stb and stbu are broken under 64bit Linux
#ifndef _WIN32
#ifdef _M_X64
Default(inst);
return;
#endif
#endif
gpr.Lock(s, a); gpr.Lock(s, a);
gpr.FlushLockX(ABI_PARAM1, ABI_PARAM2); gpr.FlushLockX(ABI_PARAM1, ABI_PARAM2);
MOV(32, R(ABI_PARAM2), gpr.R(a)); MOV(32, R(ABI_PARAM2), gpr.R(a));

4
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -347,7 +347,11 @@ bool Renderer::Initialize()
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // perspective correct interpolation of colors and tex coords glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // perspective correct interpolation of colors and tex coords
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
glDisable(GL_STENCIL_TEST); glDisable(GL_STENCIL_TEST);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);

4
Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
View File

@ -79,6 +79,9 @@ void TextureMngr::TCacheEntry::SetTextureParameters(TexMode0 &newmode)
if (newmode.wrap_s == 2 || newmode.wrap_t == 2) { if (newmode.wrap_s == 2 || newmode.wrap_t == 2) {
DEBUG_LOG("cannot support mirrorred repeat mode\n"); DEBUG_LOG("cannot support mirrorred repeat mode\n");
} }
if (newmode.wrap_s == 1 || newmode.wrap_t == 1) {
DEBUG_LOG("cannot support repeat mode\n");
}
} }
else { else {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
@ -93,7 +96,6 @@ void TextureMngr::TCacheEntry::SetTextureParameters(TexMode0 &newmode)
else else
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
(g_Config.bForceFiltering || newmode.min_filter >= 4) ? GL_LINEAR : GL_NEAREST); (g_Config.bForceFiltering || newmode.min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, c_WrapSettings[newmode.wrap_s]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, c_WrapSettings[newmode.wrap_s]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, c_WrapSettings[newmode.wrap_t]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, c_WrapSettings[newmode.wrap_t]);
} }