From e1903dd925553896e5b56596dd36fdd260f8e496 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Sun, 10 Mar 2013 10:16:22 +0100 Subject: [PATCH] Change some qglTexParameterf to qglTexParameteri Scott S. pointed out that some the qglTexParameterf calls should be qglTexParameteri. I don't know if all this changes are correct (I'm an openGL noob) but they shouldn't make thinks worse and "works for me". --- src/refresh/r_draw.c | 8 ++++---- src/refresh/r_image.c | 20 ++++++++++---------- src/refresh/r_lightmap.c | 8 ++++---- src/refresh/r_misc.c | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/refresh/r_draw.c b/src/refresh/r_draw.c index 9434dfe2..a86f3173 100644 --- a/src/refresh/r_draw.c +++ b/src/refresh/r_draw.c @@ -39,8 +39,8 @@ Draw_InitLocal(void) /* load console characters (don't bilerp characters) */ draw_chars = R_FindImage("pics/conchars.pcx", it_pic); R_Bind(draw_chars->texnum); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } /* @@ -361,8 +361,8 @@ Draw_StretchRaw(int x, int y, int w, int h, int cols, int rows, byte *data) image8); } - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); qglBegin(GL_QUADS); qglTexCoord2f(1.0 / 512.0, 1.0 / 512.0); diff --git a/src/refresh/r_image.c b/src/refresh/r_image.c index 54d73fd9..975064a2 100644 --- a/src/refresh/r_image.c +++ b/src/refresh/r_image.c @@ -306,15 +306,15 @@ R_TextureMode(char *string) if ((glt->type != it_pic) && (glt->type != it_sky)) { R_Bind(glt->texnum); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); /* Set anisotropic filter if supported and enabled */ if (gl_config.anisotropic && gl_anisotropic->value) { - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, gl_anisotropic->value); } } @@ -818,18 +818,18 @@ done: if (mipmap) { - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); } else { - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); } if (mipmap && gl_config.anisotropic && gl_anisotropic->value) { - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, gl_anisotropic->value); } @@ -859,8 +859,8 @@ R_Upload8(byte *data, int width, int height, qboolean mipmap, qboolean is_sky) width, height, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, data); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); return false; /* SBF: FIXME - what is the correct return value? */ } diff --git a/src/refresh/r_lightmap.c b/src/refresh/r_lightmap.c index 801de81c..b1ed39ed 100644 --- a/src/refresh/r_lightmap.c +++ b/src/refresh/r_lightmap.c @@ -53,8 +53,8 @@ LM_UploadBlock(qboolean dynamic) } R_Bind(gl_state.lightmap_textures + texture); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); if (dynamic) { @@ -277,8 +277,8 @@ LM_BeginBuildingLightmaps(model_t *m) /* initialize the dynamic lightmap texture */ R_Bind(gl_state.lightmap_textures + 0); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); qglTexImage2D(GL_TEXTURE_2D, 0, gl_lms.internal_format, BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_LIGHTMAP_FORMAT, GL_UNSIGNED_BYTE, dummy); diff --git a/src/refresh/r_misc.c b/src/refresh/r_misc.c index b63a3b19..93c9f35b 100644 --- a/src/refresh/r_misc.c +++ b/src/refresh/r_misc.c @@ -183,11 +183,11 @@ R_SetDefaultState(void) R_TextureAlphaMode(gl_texturealphamode->string); R_TextureSolidMode(gl_texturesolidmode->string); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); + qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);