TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fold glTexParameteri calls

Browse source
This commit is contained in:
Kp 2016-09-03 17:30:18 +00:00
parent 9d2fd0ebfa
commit 8d019a63fb
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
similar/arch/ogl/ogl.cpp
View file

@ -1682,35 +1682,39 @@ static int ogl_loadtexture (const uint8_t *data, int dxo, int dyo, ogl_texture &
// should match structue in menu.cpp // should match structue in menu.cpp
// organized in switches for better readability // organized in switches for better readability
bool buildmipmap = false; bool buildmipmap = false;
GLint gl_mag_filter_int, gl_min_filter_int;
switch (texfilt) switch (texfilt)
{ {
default: default:
case OGL_TEXFILT_CLASSIC: // Classic - Nearest case OGL_TEXFILT_CLASSIC: // Classic - Nearest
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); gl_mag_filter_int = GL_NEAREST;
#ifndef OGLES #ifndef OGLES
if (texanis && ogl_maxanisotropy > 1.0) if (texanis && ogl_maxanisotropy > 1.0)
{ {
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR); // looks nicer if anisotropy is applied. // looks nicer if anisotropy is applied.
gl_min_filter_int = GL_NEAREST_MIPMAP_LINEAR;
buildmipmap = true; buildmipmap = true;
} }
else else
#endif #endif
{ {
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_min_filter_int = GL_NEAREST;
buildmipmap = false; buildmipmap = false;
} }
break; break;
case OGL_TEXFILT_UPSCALE: // Upscaled - i.e. Blocky Filtered (Bilinear) case OGL_TEXFILT_UPSCALE: // Upscaled - i.e. Blocky Filtered (Bilinear)
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR); gl_mag_filter_int = GL_LINEAR_MIPMAP_LINEAR;
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); gl_min_filter_int = GL_LINEAR_MIPMAP_LINEAR;
buildmipmap = true; buildmipmap = true;
break; break;
case OGL_TEXFILT_TRLINEAR: // Smooth - Trilinear case OGL_TEXFILT_TRLINEAR: // Smooth - Trilinear
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); gl_mag_filter_int = GL_LINEAR;
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); gl_min_filter_int = GL_LINEAR_MIPMAP_LINEAR;
buildmipmap = true; buildmipmap = true;
break; break;
} }
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_mag_filter_int);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_min_filter_int);
#ifndef OGLES #ifndef OGLES
if (texanis && ogl_maxanisotropy > 1.0) if (texanis && ogl_maxanisotropy > 1.0)
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, ogl_maxanisotropy); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, ogl_maxanisotropy);