Mesa (texfilter_float_branch): mesa: get rid of gl_texture_object:: _BorderChan

Brian Paul brianp at kemper.freedesktop.org
Thu Mar 12 20:02:45 PDT 2009


Module: Mesa
Branch: texfilter_float_branch
Commit: f07a3bc8c13f7ce55e2060d309caa43b321a711c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f07a3bc8c13f7ce55e2060d309caa43b321a711c

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Mar 11 19:09:19 2009 -0600

mesa: get rid of gl_texture_object::_BorderChan

---

 src/mesa/main/mtypes.h   |    1 -
 src/mesa/main/texparam.c |    4 ----
 2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 9c1deef..1738324 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1296,7 +1296,6 @@ struct gl_texture_object
    GLenum Target;               /**< GL_TEXTURE_1D, GL_TEXTURE_2D, etc. */
    GLfloat Priority;		/**< in [0,1] */
    GLfloat BorderColor[4];	/**< unclamped */
-   GLchan _BorderChan[4];	/**< clamped, as GLchan */
    GLenum WrapS;		/**< S-axis texture image wrap mode */
    GLenum WrapT;		/**< T-axis texture image wrap mode */
    GLenum WrapR;		/**< R-axis texture image wrap mode */
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 50f867e..15c4aa3 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -483,10 +483,6 @@ set_tex_parameterf(GLcontext *ctx,
       texObj->BorderColor[GCOMP] = params[1];
       texObj->BorderColor[BCOMP] = params[2];
       texObj->BorderColor[ACOMP] = params[3];
-      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[RCOMP], params[0]);
-      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[GCOMP], params[1]);
-      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[BCOMP], params[2]);
-      UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[ACOMP], params[3]);
       return;
 
    default:



More information about the mesa-commit mailing list