aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i915/i830_texblend.c
diff options
context:
space:
mode:
authorAlan Hourihane <[email protected]>2004-12-14 09:11:52 +0000
committerAlan Hourihane <[email protected]>2004-12-14 09:11:52 +0000
commit38b317d508a2a3a4cc6d700ebca80c3b06c913e2 (patch)
tree017e198082e3b2c633beef5a69f9d9088124b37a /src/mesa/drivers/dri/i915/i830_texblend.c
parent9fb024ba970b808d357a00ab7b8739a78559b39e (diff)
uint*t -> u_int*t changes
Diffstat (limited to 'src/mesa/drivers/dri/i915/i830_texblend.c')
-rw-r--r--src/mesa/drivers/dri/i915/i830_texblend.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c
index b1500227134..49e0347643c 100644
--- a/src/mesa/drivers/dri/i915/i830_texblend.c
+++ b/src/mesa/drivers/dri/i915/i830_texblend.c
@@ -161,12 +161,6 @@ i830SetTexEnvCombine(i830ContextPtr i830,
TEXPIPE_ALPHA | TEXBLEND_ARG2 | TEXBLENDARG_MODIFY_PARMS,
TEXPIPE_ALPHA | TEXBLEND_ARG0 | TEXBLENDARG_MODIFY_PARMS,
};
- static const GLuint op_rgb[4] = {
- 0,
- TEXBLENDARG_INV_ARG,
- TEXBLENDARG_REPLICATE_ALPHA,
- TEXBLENDARG_REPLICATE_ALPHA | TEXBLENDARG_INV_ARG,
- };
if(INTEL_DEBUG&DEBUG_TEXTURE)
fprintf(stderr, "%s\n", __FUNCTION__);
@@ -404,8 +398,6 @@ static void emit_texblend( i830ContextPtr i830, GLuint unit, GLuint blendUnit,
GLboolean last_stage )
{
struct gl_texture_unit *texUnit = &i830->intel.ctx.Texture.Unit[unit];
- struct gl_texture_object *tObj = texUnit->_Current;
- i830TextureObjectPtr t = (i830TextureObjectPtr)tObj->DriverData;
GLuint tmp[I830_TEXBLEND_SIZE], tmp_sz;