diff options
author | Brian Paul <[email protected]> | 2009-03-11 19:23:01 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2009-03-11 19:23:01 -0600 |
commit | 590f6fe05030cb274067a9e58af9d8306d97d0b9 (patch) | |
tree | 13909cf154a941f9b30fcf17a3eeb92510523d93 /src/mesa/main/texstate.c | |
parent | 7d9cb242fdbb55f1486ec09b27709bedebfdb2c1 (diff) |
mesa: remove gl_texture_object::_Function field and associated code
It was only used in one place in swrast.
Diffstat (limited to 'src/mesa/main/texstate.c')
-rw-r--r-- | src/mesa/main/texstate.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 2b07da805c0..d71f9530cb3 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -354,37 +354,6 @@ update_texture_matrices( GLcontext *ctx ) /** - * Update texture object's _Function field. We need to do this - * whenever any of the texture object's shadow-related fields change - * or when we start/stop using a fragment program. - * - * This function could be expanded someday to update additional per-object - * fields that depend on assorted state changes. - */ -static void -update_texture_compare_function(GLcontext *ctx, - struct gl_texture_object *tObj) -{ - /* XXX temporarily disable this test since it breaks the GLSL - * shadow2D(), etc. functions. - */ - if (0 /*ctx->FragmentProgram._Current*/) { - /* Texel/coordinate comparison is ignored for programs. - * See GL_ARB_fragment_program/shader spec for details. - */ - tObj->_Function = GL_NONE; - } - else if (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) { - /* GL_ARB_shadow */ - tObj->_Function = tObj->CompareFunc; - } - else { - tObj->_Function = GL_NONE; /* pass depth through as grayscale */ - } -} - - -/** * Examine texture unit's combine/env state to update derived state. */ static void @@ -589,7 +558,6 @@ update_texture_state( GLcontext *ctx ) enabledFragUnits |= (1 << unit); update_tex_combine(ctx, texUnit); - update_texture_compare_function(ctx, texUnit->_Current); } |