mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 13:27:45 -07:00
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:
parent
8e0823bf37
commit
29faf7776b
@ -373,6 +373,14 @@ namespace Jit64
|
||||
#endif*/
|
||||
|
||||
//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.FlushLockX(ABI_PARAM1, ABI_PARAM2);
|
||||
MOV(32, R(ABI_PARAM2), gpr.R(a));
|
||||
|
@ -347,7 +347,11 @@ bool Renderer::Initialize()
|
||||
glDisable(GL_LIGHTING);
|
||||
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_LINE_SMOOTH_HINT, GL_NICEST);
|
||||
glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
|
||||
|
||||
glDisable(GL_STENCIL_TEST);
|
||||
glEnable(GL_SCISSOR_TEST);
|
||||
|
@ -79,6 +79,9 @@ void TextureMngr::TCacheEntry::SetTextureParameters(TexMode0 &newmode)
|
||||
if (newmode.wrap_s == 2 || newmode.wrap_t == 2) {
|
||||
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 {
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
|
||||
@ -93,7 +96,6 @@ void TextureMngr::TCacheEntry::SetTextureParameters(TexMode0 &newmode)
|
||||
else
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
|
||||
(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_T, c_WrapSettings[newmode.wrap_t]);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user