From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Mar 2009 01:09:19 +0000 (-0600)
Subject: mesa: get rid of gl_texture_object::_BorderChan
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7fbae9f41d79fc410f6c6638e26be0ff2be545bd;p=mesa.git

mesa: get rid of gl_texture_object::_BorderChan
---

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c1f06885ec4..10f0d067e33 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 50f867e1c1c..15c4aa31216 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: