OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: avoid setting texObj->_Complete = GL_FALSE when there's no state change

Browse Source 
Avoid a little bit of unneeded state validation and fixes a bug where the
texture complete flags was set to false, but we didn't signal _NEW_TEXTURE.

Fixes piglit tex1d-2dborder failure.
This commit is contained in:
Brian Paul
2009-02-09 13:58:32 -07:00
parent 37c768b36a
commit aad3f546a0
1 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/mesa/main/texparam.c
View File

@@ -3,7 +3,7 @@
* Version: 7.5 * Version: 7.5
* *
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2009 VMware, Inc. All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -165,6 +165,20 @@ set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
} }
/**
* This is called just prior to changing any texture object state.
* Any pending rendering will be flushed out, we'll set the _NEW_TEXTURE
* state flag and then mark the texture object as 'incomplete' so that any
* per-texture derived state gets recomputed.
*/
static INLINE void
flush(GLcontext *ctx, struct gl_texture_object *texObj)
{
FLUSH_VERTICES(ctx, _NEW_TEXTURE);
texObj->_Complete = GL_FALSE;
}
/** Set an integer-valued texture parameter */ /** Set an integer-valued texture parameter */
static void static void
set_tex_parameteri(GLcontext *ctx, set_tex_parameteri(GLcontext *ctx,
@@ -178,7 +192,7 @@ set_tex_parameteri(GLcontext *ctx,
switch (params[0]) { switch (params[0]) {
case GL_NEAREST: case GL_NEAREST:
case GL_LINEAR: case GL_LINEAR:
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->MinFilter = params[0]; texObj->MinFilter = params[0];
return; return;
case GL_NEAREST_MIPMAP_NEAREST: case GL_NEAREST_MIPMAP_NEAREST:
@@ -186,7 +200,7 @@ set_tex_parameteri(GLcontext *ctx,
case GL_NEAREST_MIPMAP_LINEAR: case GL_NEAREST_MIPMAP_LINEAR:
case GL_LINEAR_MIPMAP_LINEAR: case GL_LINEAR_MIPMAP_LINEAR:
if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) { if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->MinFilter = params[0]; texObj->MinFilter = params[0];
return; return;
} }
@@ -202,7 +216,7 @@ set_tex_parameteri(GLcontext *ctx,
switch (params[0]) { switch (params[0]) {
case GL_NEAREST: case GL_NEAREST:
case GL_LINEAR: case GL_LINEAR:
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->MagFilter = params[0]; texObj->MagFilter = params[0];
return; return;
default: default:
@@ -214,7 +228,7 @@ set_tex_parameteri(GLcontext *ctx,
if (texObj->WrapS == params[0]) if (texObj->WrapS == params[0])
return; return;
if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) { if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->WrapS = params[0]; texObj->WrapS = params[0];
} }
return; return;
@@ -223,7 +237,7 @@ set_tex_parameteri(GLcontext *ctx,
if (texObj->WrapT == params[0]) if (texObj->WrapT == params[0])
return; return;
if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) { if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->WrapT = params[0]; texObj->WrapT = params[0];
} }
return; return;
@@ -232,7 +246,7 @@ set_tex_parameteri(GLcontext *ctx,
if (texObj->WrapR == params[0]) if (texObj->WrapR == params[0])
return; return;
if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) { if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->WrapR = params[0]; texObj->WrapR = params[0];
} }
return; return;
@@ -245,7 +259,7 @@ set_tex_parameteri(GLcontext *ctx,
_mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)"); _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)");
return; return;
} }
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->BaseLevel = params[0]; texObj->BaseLevel = params[0];
return; return;
@@ -256,14 +270,14 @@ set_tex_parameteri(GLcontext *ctx,
_mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)"); _mesa_error(ctx, GL_INVALID_OPERATION, "glTexParameter(param)");
return; return;
} }
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->MaxLevel = params[0]; texObj->MaxLevel = params[0];
return; return;
case GL_GENERATE_MIPMAP_SGIS: case GL_GENERATE_MIPMAP_SGIS:
if (ctx->Extensions.SGIS_generate_mipmap) { if (ctx->Extensions.SGIS_generate_mipmap) {
if (texObj->GenerateMipmap != params[0]) { if (texObj->GenerateMipmap != params[0]) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE; texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
} }
} }
@@ -278,7 +292,7 @@ set_tex_parameteri(GLcontext *ctx,
(params[0] == GL_NONE || (params[0] == GL_NONE ||
params[0] == GL_COMPARE_R_TO_TEXTURE_ARB)) { params[0] == GL_COMPARE_R_TO_TEXTURE_ARB)) {
if (texObj->CompareMode != params[0]) { if (texObj->CompareMode != params[0]) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->CompareMode = params[0]; texObj->CompareMode = params[0];
} }
} }
@@ -295,7 +309,7 @@ set_tex_parameteri(GLcontext *ctx,
switch (params[0]) { switch (params[0]) {
case GL_LEQUAL: case GL_LEQUAL:
case GL_GEQUAL: case GL_GEQUAL:
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->CompareFunc = params[0]; texObj->CompareFunc = params[0];
return; return;
case GL_EQUAL: case GL_EQUAL:
@@ -305,7 +319,7 @@ set_tex_parameteri(GLcontext *ctx,
case GL_ALWAYS: case GL_ALWAYS:
case GL_NEVER: case GL_NEVER:
if (ctx->Extensions.EXT_shadow_funcs) { if (ctx->Extensions.EXT_shadow_funcs) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->CompareFunc = params[0]; texObj->CompareFunc = params[0];
return; return;
} }
@@ -326,7 +340,7 @@ set_tex_parameteri(GLcontext *ctx,
params[0] == GL_INTENSITY || params[0] == GL_INTENSITY ||
params[0] == GL_ALPHA)) { params[0] == GL_ALPHA)) {
if (texObj->DepthMode != params[0]) { if (texObj->DepthMode != params[0]) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->DepthMode = params[0]; texObj->DepthMode = params[0];
} }
} }
@@ -359,7 +373,7 @@ set_tex_parameteri(GLcontext *ctx,
} }
ASSERT(comp < 4); ASSERT(comp < 4);
if (swz >= 0) { if (swz >= 0) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->Swizzle[comp] = params[0]; texObj->Swizzle[comp] = params[0];
set_swizzle_component(&texObj->_Swizzle, comp, swz); set_swizzle_component(&texObj->_Swizzle, comp, swz);
return; return;
@@ -371,7 +385,7 @@ set_tex_parameteri(GLcontext *ctx,
case GL_TEXTURE_SWIZZLE_RGBA_EXT: case GL_TEXTURE_SWIZZLE_RGBA_EXT:
if (ctx->Extensions.EXT_texture_swizzle) { if (ctx->Extensions.EXT_texture_swizzle) {
GLuint comp; GLuint comp;
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
for (comp = 0; comp < 4; comp++) { for (comp = 0; comp < 4; comp++) {
const GLint swz = comp_to_swizzle(params[comp]); const GLint swz = comp_to_swizzle(params[comp]);
if (swz >= 0) { if (swz >= 0) {
@@ -405,19 +419,19 @@ set_tex_parameterf(GLcontext *ctx,
case GL_TEXTURE_MIN_LOD: case GL_TEXTURE_MIN_LOD:
if (texObj->MinLod == params[0]) if (texObj->MinLod == params[0])
return; return;
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->MinLod = params[0]; texObj->MinLod = params[0];
return; return;
case GL_TEXTURE_MAX_LOD: case GL_TEXTURE_MAX_LOD:
if (texObj->MaxLod == params[0]) if (texObj->MaxLod == params[0])
return; return;
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->MaxLod = params[0]; texObj->MaxLod = params[0];
return; return;
case GL_TEXTURE_PRIORITY: case GL_TEXTURE_PRIORITY:
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->Priority = CLAMP(params[0], 0.0F, 1.0F); texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);
return; return;
@@ -429,7 +443,7 @@ set_tex_parameterf(GLcontext *ctx,
_mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" ); _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
return; return;
} }
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
/* clamp to max, that's what NVIDIA does */ /* clamp to max, that's what NVIDIA does */
texObj->MaxAnisotropy = MIN2(params[0], texObj->MaxAnisotropy = MIN2(params[0],
ctx->Const.MaxTextureMaxAnisotropy); ctx->Const.MaxTextureMaxAnisotropy);
@@ -443,7 +457,7 @@ set_tex_parameterf(GLcontext *ctx,
case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB: case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
if (ctx->Extensions.ARB_shadow_ambient) { if (ctx->Extensions.ARB_shadow_ambient) {
if (texObj->CompareFailValue != params[0]) { if (texObj->CompareFailValue != params[0]) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F); texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
} }
} }
@@ -457,14 +471,14 @@ set_tex_parameterf(GLcontext *ctx,
/* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */ /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */
if (ctx->Extensions.EXT_texture_lod_bias) { if (ctx->Extensions.EXT_texture_lod_bias) {
if (texObj->LodBias != params[0]) { if (texObj->LodBias != params[0]) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->LodBias = params[0]; texObj->LodBias = params[0];
} }
} }
break; break;
case GL_TEXTURE_BORDER_COLOR: case GL_TEXTURE_BORDER_COLOR:
FLUSH_VERTICES(ctx, _NEW_TEXTURE); flush(ctx, texObj);
texObj->BorderColor[RCOMP] = params[0]; texObj->BorderColor[RCOMP] = params[0];
texObj->BorderColor[GCOMP] = params[1]; texObj->BorderColor[GCOMP] = params[1];
texObj->BorderColor[BCOMP] = params[2]; texObj->BorderColor[BCOMP] = params[2];
@@ -515,8 +529,6 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
set_tex_parameterf(ctx, texObj, pname, &param); set_tex_parameterf(ctx, texObj, pname, &param);
} }
texObj->_Complete = GL_FALSE;
if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) { if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
ctx->Driver.TexParameter(ctx, target, texObj, pname, &param); ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);
} }
@@ -572,8 +584,6 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
set_tex_parameterf(ctx, texObj, pname, params); set_tex_parameterf(ctx, texObj, pname, params);
} }
texObj->_Complete = GL_FALSE;
if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) { if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
ctx->Driver.TexParameter(ctx, target, texObj, pname, params); ctx->Driver.TexParameter(ctx, target, texObj, pname, params);
} }
@@ -609,8 +619,6 @@ _mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
set_tex_parameteri(ctx, texObj, pname, &param); set_tex_parameteri(ctx, texObj, pname, &param);
} }
texObj->_Complete = GL_FALSE;
if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) { if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
GLfloat fparam = (GLfloat) param; GLfloat fparam = (GLfloat) param;
ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam); ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);
@@ -658,8 +666,6 @@ _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
set_tex_parameteri(ctx, texObj, pname, params); set_tex_parameteri(ctx, texObj, pname, params);
} }
texObj->_Complete = GL_FALSE;
if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) { if (ctx->Driver.TexParameter && ctx->ErrorValue == GL_NO_ERROR) {
GLfloat fparams[4]; GLfloat fparams[4];
fparams[0] = INT_TO_FLOAT(params[0]); fparams[0] = INT_TO_FLOAT(params[0]);