diff options
| author | Brian Paul <brianp@vmware.com> | 2009-03-11 19:09:19 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-04-01 20:24:23 -0600 |
| commit | 7fbae9f41d79fc410f6c6638e26be0ff2be545bd (patch) | |
| tree | 93305f0493c912843756ab737cfcff2face73a03 | |
| parent | 79c55e55f808d77cb0dff7cda826719d5fda3c7d (diff) | |
mesa: get rid of gl_texture_object::_BorderChan
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | 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 c1f06885ec..10f0d067e3 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 50f867e1c1..15c4aa3121 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: |