blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2024-11-14 00:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Straighten out USE_GLMIPMAP platform/OS confusion in r_image.c.

Browse source
This commit is contained in:
Knightmare66 2021-10-11 17:58:06 -04:00
parent 6eec9c1a76
commit fa0f460482
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
renderer/r_image.c
View file

@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif // _WIN32
#ifndef _WIN32 // Let's not use GLU on Linux/macOS -flibit
//#define USE_GLMIPMAP
#ifdef _WIN32 // Let's not use GLU on Linux/macOS -flibit
#define USE_GLU_MIPMAP
#endif // _WIN32
image_t gltextures[MAX_GLTEXTURES];
@ -2006,7 +2006,19 @@ qboolean GL_Upload32 (unsigned *data, int width, int height, imagetype_t type)
//
// generate mipmaps and upload
//
#ifdef USE_GLMIPMAP
#ifdef USE_GLU_MIPMAP
if (mipmap)
{
if (glState.sgis_mipmap) {
qglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, true);
qglTexImage2D (GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
}
else
gluBuild2DMipmaps (GL_TEXTURE_2D, comp, scaled_width, scaled_height, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
}
else
qglTexImage2D (GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
#else // USE_GLU_MIPMAP
qglTexImage2D (GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
if (mipmap)
{
@ -2022,19 +2034,7 @@ qboolean GL_Upload32 (unsigned *data, int width, int height, imagetype_t type)
qglTexImage2D (GL_TEXTURE_2D, miplevel, comp, mip_width, mip_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
}
}
#else
if (mipmap)
{
if (glState.sgis_mipmap) {
qglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, true);
qglTexImage2D (GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
}
else
gluBuild2DMipmaps (GL_TEXTURE_2D, comp, scaled_width, scaled_height, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
}
else
qglTexImage2D (GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
#endif
#endif // USE_GLU_MIPMAP
// if (scaled_width != width || scaled_height != height)
if (resampled)