Remove gl enum hacks in texturecache (doesn't seem to work, get bad log output on adreno)

This commit is contained in:
Henrik Rydgard 2013-06-19 12:42:04 +02:00
parent 7dac11922d
commit 8f9562cde4

View File

@ -484,16 +484,6 @@ static const GLuint MagFiltGL[2] = {
GL_LINEAR
};
// OpenGL ES 2.0 workaround. This SHOULD be available but is NOT in the headers in Android.
// Let's see if this hackery works.
#ifndef GL_TEXTURE_LOD_BIAS
#define GL_TEXTURE_LOD_BIAS 0x8501
#endif
#ifndef GL_TEXTURE_MAX_LOD
#define GL_TEXTURE_MAX_LOD 0x813B
#endif
// This should not have to be done per texture! OpenGL is silly yo
// TODO: Dirty-check this against the current texture.
void TextureCache::UpdateSamplingParams(TexCacheEntry &entry, bool force) {
@ -509,7 +499,9 @@ void TextureCache::UpdateSamplingParams(TexCacheEntry &entry, bool force) {
// TODO: Is this a signed value? Which direction?
float lodBias = 0.0; // -(float)((gstate.texlevel >> 16) & 0xFF) / 16.0f;
if (force || entry.lodBias != lodBias) {
#ifndef USING_GLES2
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, lodBias);
#endif
entry.lodBias = lodBias;
}
}
@ -1117,8 +1109,8 @@ void TextureCache::SetTexture() {
LoadTextureLevel(*entry, i, replaceImages);
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, maxLevel);
#endif
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, (float)maxLevel);
#endif
} else {
LoadTextureLevel(*entry, 0, replaceImages);
#ifndef USING_GLES2