fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: remove target param from ctx->Driver.TexParameter()

Browse source 
Not really used anywhere.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Brian Paul 2014-01-31 17:28:08 -07:00
parent c20b48c48e
commit deb9dd6e27
6 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/nouveau/nouveau_state.c
View file

@ -392,7 +392,7 @@ nouveau_tex_env(struct gl_context *ctx, GLenum target, GLenum pname,
}
static void
nouveau_tex_parameter(struct gl_context *ctx, GLenum target,
nouveau_tex_parameter(struct gl_context *ctx,
struct gl_texture_object *t, GLenum pname,
const GLfloat *params)
{

5
src/mesa/drivers/dri/r200/r200_tex.c
View file

@ -375,16 +375,15 @@ void r200TexUpdateParameters(struct gl_context *ctx, GLuint unit)
* Changes variables and flags for a state update, which will happen at the
* next UpdateTextureState
*/
static void r200TexParameter( struct gl_context *ctx, GLenum target,
static void r200TexParameter( struct gl_context *ctx,
struct gl_texture_object *texObj,
GLenum pname, const GLfloat *params )
{
radeonTexObj* t = radeon_tex_obj(texObj);
radeon_print(RADEON_TEXTURE | RADEON_STATE, RADEON_VERBOSE,
"%s(%p, tex %p) target %s, pname %s\n",
"%s(%p, tex %p) pname %s\n",
__FUNCTION__, ctx, texObj,
_mesa_lookup_enum_by_nr( target ),
_mesa_lookup_enum_by_nr( pname ) );
switch ( pname ) {

2
src/mesa/drivers/dri/radeon/radeon_tex.c
View file

@ -328,7 +328,7 @@ void radeonTexUpdateParameters(struct gl_context *ctx, GLuint unit)
* next UpdateTextureState
*/
static void radeonTexParameter( struct gl_context *ctx, GLenum target,
static void radeonTexParameter( struct gl_context *ctx,
struct gl_texture_object *texObj,
GLenum pname, const GLfloat *params )
{

2
src/mesa/main/dd.h
View file

@ -543,7 +543,7 @@ struct dd_function_table {
void (*TexEnv)(struct gl_context *ctx, GLenum target, GLenum pname,
const GLfloat *param);
/** Set texture parameters */
void (*TexParameter)(struct gl_context *ctx, GLenum target,
void (*TexParameter)(struct gl_context *ctx,
struct gl_texture_object *texObj,
GLenum pname, const GLfloat *params);
/** Set the viewport */

10
src/mesa/main/texobj.c
View file

@ -189,12 +189,12 @@ finish_texture_init(struct gl_context *ctx, GLenum target,
if (ctx->Driver.TexParameter) {
static const GLfloat fparam_wrap[1] = {(GLfloat) GL_CLAMP_TO_EDGE};
const GLfloat fparam_filter[1] = {(GLfloat) filter};
ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_S, fparam_wrap);
ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_T, fparam_wrap);
ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_R, fparam_wrap);
ctx->Driver.TexParameter(ctx, target, obj,
ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_S, fparam_wrap);
ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_T, fparam_wrap);
ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_R, fparam_wrap);
ctx->Driver.TexParameter(ctx, obj,
GL_TEXTURE_MIN_FILTER, fparam_filter);
ctx->Driver.TexParameter(ctx, target, obj,
ctx->Driver.TexParameter(ctx, obj,
GL_TEXTURE_MAG_FILTER, fparam_filter);
}
break;

8
src/mesa/main/texparam.c
View file

@ -784,7 +784,7 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
}
if (ctx->Driver.TexParameter && need_update) {
ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);
ctx->Driver.TexParameter(ctx, texObj, pname, &param);
}
}
@ -855,7 +855,7 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
}
if (ctx->Driver.TexParameter && need_update) {
ctx->Driver.TexParameter(ctx, target, texObj, pname, params);
ctx->Driver.TexParameter(ctx, texObj, pname, params);
}
}
@ -898,7 +898,7 @@ _mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
if (ctx->Driver.TexParameter && need_update) {
GLfloat fparam = (GLfloat) param;
ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);
ctx->Driver.TexParameter(ctx, texObj, pname, &fparam);
}
}
@ -954,7 +954,7 @@ _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
fparams[2] = INT_TO_FLOAT(params[2]);
fparams[3] = INT_TO_FLOAT(params[3]);
}
ctx->Driver.TexParameter(ctx, target, texObj, pname, fparams);
ctx->Driver.TexParameter(ctx, texObj, pname, fparams);
}
}