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

mesa: remove 'params' parameter from ctx->Driver.TexParameter()

Browse source 
None of the drivers which implement this hook do anything with the
texture parameter value.  Drivers just look at the pname and set a
dirty flag if needed.

We were doing some ugly casting and type conversion to setup the
argument so that all goes away.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Brian Paul 2016-10-07 14:28:21 -06:00
parent 99d790538d
commit a710c21ac2
8 changed files with 20 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -395,8 +395,7 @@ nouveau_tex_env(struct gl_context *ctx, GLenum target, GLenum pname,
static void static void
nouveau_tex_parameter(struct gl_context *ctx, nouveau_tex_parameter(struct gl_context *ctx,
struct gl_texture_object *t, GLenum pname, struct gl_texture_object *t, GLenum pname)
const GLfloat *params)
{ {
switch (pname) { switch (pname) {
case GL_TEXTURE_MAG_FILTER: case GL_TEXTURE_MAG_FILTER:

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

@ -374,9 +374,9 @@ void r200TexUpdateParameters(struct gl_context *ctx, GLuint unit)
* Changes variables and flags for a state update, which will happen at the * Changes variables and flags for a state update, which will happen at the
* next UpdateTextureState * next UpdateTextureState
*/ */
static void r200TexParameter( struct gl_context *ctx, static void r200TexParameter(struct gl_context *ctx,
struct gl_texture_object *texObj, struct gl_texture_object *texObj,
GLenum pname, const GLfloat *params ) GLenum pname)
{ {
radeonTexObj* t = radeon_tex_obj(texObj); radeonTexObj* t = radeon_tex_obj(texObj);

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

@ -329,7 +329,7 @@ void radeonTexUpdateParameters(struct gl_context *ctx, GLuint unit)
static void radeonTexParameter( struct gl_context *ctx, static void radeonTexParameter( struct gl_context *ctx,
struct gl_texture_object *texObj, struct gl_texture_object *texObj,
GLenum pname, const GLfloat *params ) GLenum pname )
{ {
radeonTexObj* t = radeon_tex_obj(texObj); radeonTexObj* t = radeon_tex_obj(texObj);

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

@ -610,10 +610,9 @@ struct dd_function_table {
/** Set texture environment parameters */ /** Set texture environment parameters */
void (*TexEnv)(struct gl_context *ctx, GLenum target, GLenum pname, void (*TexEnv)(struct gl_context *ctx, GLenum target, GLenum pname,
const GLfloat *param); const GLfloat *param);
/** Set texture parameters */ /** Set texture parameter (callee gets param value from the texObj) */
void (*TexParameter)(struct gl_context *ctx, void (*TexParameter)(struct gl_context *ctx,
struct gl_texture_object *texObj, struct gl_texture_object *texObj, GLenum pname);
GLenum pname, const GLfloat *params);
/** Set the viewport */ /** Set the viewport */
void (*Viewport)(struct gl_context *ctx); void (*Viewport)(struct gl_context *ctx);
/*@}*/ /*@}*/

6
src/mesa/main/teximage.c
View file

@ -5082,12 +5082,10 @@ texture_buffer_range(struct gl_context *ctx,
if (ctx->Driver.TexParameter) { if (ctx->Driver.TexParameter) {
if (offset != oldOffset) { if (offset != oldOffset) {
ctx->Driver.TexParameter(ctx, texObj, GL_TEXTURE_BUFFER_OFFSET, ctx->Driver.TexParameter(ctx, texObj, GL_TEXTURE_BUFFER_OFFSET);
(const GLfloat *) &offset);
} }
if (size != oldSize) { if (size != oldSize) {
ctx->Driver.TexParameter(ctx, texObj, GL_TEXTURE_BUFFER_SIZE, ctx->Driver.TexParameter(ctx, texObj, GL_TEXTURE_BUFFER_SIZE);
(const GLfloat *) &size);
} }
} }

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

@ -365,15 +365,12 @@ finish_texture_init(struct gl_context *ctx, GLenum target,
obj->Sampler.MinFilter = filter; obj->Sampler.MinFilter = filter;
obj->Sampler.MagFilter = filter; obj->Sampler.MagFilter = filter;
if (ctx->Driver.TexParameter) { if (ctx->Driver.TexParameter) {
static const GLfloat fparam_wrap[1] = {(GLfloat) GL_CLAMP_TO_EDGE}; /* XXX we probably don't need to make all these calls */
const GLfloat fparam_filter[1] = {(GLfloat) filter}; ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_S);
ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_S, fparam_wrap); ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_T);
ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_T, fparam_wrap); ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_R);
ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_WRAP_R, fparam_wrap); ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_MIN_FILTER);
ctx->Driver.TexParameter(ctx, obj, ctx->Driver.TexParameter(ctx, obj, GL_TEXTURE_MAG_FILTER);
GL_TEXTURE_MIN_FILTER, fparam_filter);
ctx->Driver.TexParameter(ctx, obj,
GL_TEXTURE_MAG_FILTER, fparam_filter);
} }
break; break;

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

@ -807,7 +807,7 @@ _mesa_texture_parameterf(struct gl_context *ctx,
} }
if (ctx->Driver.TexParameter && need_update) { if (ctx->Driver.TexParameter && need_update) {
ctx->Driver.TexParameter(ctx, texObj, pname, &param); ctx->Driver.TexParameter(ctx, texObj, pname);
} }
} }
@ -874,7 +874,7 @@ _mesa_texture_parameterfv(struct gl_context *ctx,
} }
if (ctx->Driver.TexParameter && need_update) { if (ctx->Driver.TexParameter && need_update) {
ctx->Driver.TexParameter(ctx, texObj, pname, params); ctx->Driver.TexParameter(ctx, texObj, pname);
} }
} }
@ -919,8 +919,7 @@ _mesa_texture_parameteri(struct gl_context *ctx,
} }
if (ctx->Driver.TexParameter && need_update) { if (ctx->Driver.TexParameter && need_update) {
GLfloat fparam = (GLfloat) param; ctx->Driver.TexParameter(ctx, texObj, pname);
ctx->Driver.TexParameter(ctx, texObj, pname, &fparam);
} }
} }
@ -964,15 +963,7 @@ _mesa_texture_parameteriv(struct gl_context *ctx,
} }
if (ctx->Driver.TexParameter && need_update) { if (ctx->Driver.TexParameter && need_update) {
GLfloat fparams[4]; ctx->Driver.TexParameter(ctx, texObj, pname);
fparams[0] = INT_TO_FLOAT(params[0]);
if (pname == GL_TEXTURE_BORDER_COLOR ||
pname == GL_TEXTURE_CROP_RECT_OES) {
fparams[1] = INT_TO_FLOAT(params[1]);
fparams[2] = INT_TO_FLOAT(params[2]);
fparams[3] = INT_TO_FLOAT(params[3]);
}
ctx->Driver.TexParameter(ctx, texObj, pname, fparams);
} }
} }

3
src/mesa/state_tracker/st_cb_texture.c
View file

@ -2860,8 +2860,7 @@ st_ClearTexSubImage(struct gl_context *ctx,
*/ */
static void static void
st_TexParameter(struct gl_context *ctx, st_TexParameter(struct gl_context *ctx,
struct gl_texture_object *texObj, struct gl_texture_object *texObj, GLenum pname)
GLenum pname, const GLfloat *params)
{ {
struct st_context *st = st_context(ctx); struct st_context *st = st_context(ctx);
struct st_texture_object *stObj = st_texture_object(texObj); struct st_texture_object *stObj = st_texture_object(texObj);