diff options
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_texstate.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_texprog.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_texstate.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex.c | 7 |
4 files changed, 12 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c index 55a5a17403..ba972dac8f 100644 --- a/src/mesa/drivers/dri/i915/i830_texstate.c +++ b/src/mesa/drivers/dri/i915/i830_texstate.c @@ -199,7 +199,7 @@ static GLboolean i830SetTexImages( i830ContextPtr i830, t->intel.image[face][i].offset = y * pitch + x * t->intel.texelBytes; - t->intel.image[face][i].internalFormat = baseImage->Format; + t->intel.image[face][i].internalFormat = baseImage->_BaseFormat; d >>= 1; x += step_offsets[face][0] * d; @@ -219,7 +219,7 @@ static GLboolean i830SetTexImages( i830ContextPtr i830, break; t->intel.image[0][i].offset = total_height * pitch; - t->intel.image[0][i].internalFormat = baseImage->Format; + t->intel.image[0][i].internalFormat = baseImage->_BaseFormat; if (t->intel.image[0][i].image->IsCompressed) { if (t->intel.image[0][i].image->Height > 4) diff --git a/src/mesa/drivers/dri/i915/i915_texprog.c b/src/mesa/drivers/dri/i915/i915_texprog.c index 3eaf53d7d5..74ece96f8b 100644 --- a/src/mesa/drivers/dri/i915/i915_texprog.c +++ b/src/mesa/drivers/dri/i915/i915_texprog.c @@ -291,7 +291,7 @@ static GLuint emit_texenv( struct i915_fragment_program *p, int unit ) struct gl_texture_unit *texUnit = &p->ctx->Texture.Unit[unit]; GLenum envMode = texUnit->EnvMode; struct gl_texture_object *tObj = texUnit->_Current; - GLenum format = tObj->Image[0][tObj->BaseLevel]->Format; + GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat; GLuint saturate = unit < p->last_tex_stage ? A0_DEST_SATURATE : 0; switch(envMode) { diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index 22f38a9239..efd6fc9450 100644 --- a/src/mesa/drivers/dri/i915/i915_texstate.c +++ b/src/mesa/drivers/dri/i915/i915_texstate.c @@ -115,7 +115,7 @@ static void i915LayoutTextureImages( i915ContextPtr i915, t->intel.image[face][i].offset = y * pitch + x * t->intel.texelBytes; - t->intel.image[face][i].internalFormat = baseImage->Format; + t->intel.image[face][i].internalFormat = baseImage->_BaseFormat; d >>= 1; x += step_offsets[face][0] * d; @@ -144,7 +144,7 @@ static void i915LayoutTextureImages( i915ContextPtr i915, t->intel.image[0][i].image = tObj->Image[0][firstLevel + i]; if (t->intel.image[0][i].image) { t->intel.image[0][i].offset = total_height * pitch; - t->intel.image[0][i].internalFormat = baseImage->Format; + t->intel.image[0][i].internalFormat = baseImage->_BaseFormat; } total_height += MAX2(2, virtual_height); @@ -171,7 +171,7 @@ static void i915LayoutTextureImages( i915ContextPtr i915, break; t->intel.image[0][i].offset = total_height * pitch; - t->intel.image[0][i].internalFormat = baseImage->Format; + t->intel.image[0][i].internalFormat = baseImage->_BaseFormat; if (t->intel.image[0][i].image->IsCompressed) { if (t->intel.image[0][i].image->Height > 4) @@ -266,7 +266,7 @@ static void i945LayoutTextureImages( i915ContextPtr i915, t->intel.image[face][i].offset = y * pitch + x * t->intel.texelBytes; - t->intel.image[face][i].internalFormat = baseImage->Format; + t->intel.image[face][i].internalFormat = baseImage->_BaseFormat; d >>= 1; @@ -326,7 +326,7 @@ static void i945LayoutTextureImages( i915ContextPtr i915, t->intel.image[0][i].offset = total_height * pitch; - t->intel.image[0][i].internalFormat = baseImage->Format; + t->intel.image[0][i].internalFormat = baseImage->_BaseFormat; @@ -358,7 +358,7 @@ static void i945LayoutTextureImages( i915ContextPtr i915, break; t->intel.image[0][i].offset = offset; - t->intel.image[0][i].internalFormat = baseImage->Format; + t->intel.image[0][i].internalFormat = baseImage->_BaseFormat; if (t->intel.image[0][i].image->IsCompressed) sz = MAX2(1, t->intel.image[0][i].image->Height/4) * pitch; diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c index 396e126011..d256dbf7cb 100644 --- a/src/mesa/drivers/dri/i915/intel_tex.c +++ b/src/mesa/drivers/dri/i915/intel_tex.c @@ -646,8 +646,7 @@ static void intelUploadTexImage( intelContextPtr intel, image->Width, image->Height, image->Depth, offset, row_len, t->Pitch, t->depth_pitch); - switch(image->IntFormat) - { + switch (image->InternalFormat) { case GL_COMPRESSED_RGB_FXT1_3DFX: case GL_COMPRESSED_RGBA_FXT1_3DFX: case GL_RGB_S3TC: @@ -669,9 +668,9 @@ static void intelUploadTexImage( intelContextPtr intel, } break; default: - fprintf(stderr,"Internal Compressed format not supported %d\n", image->IntFormat); + fprintf(stderr,"Internal Compressed format not supported %d\n", image->InternalFormat); break; - } + } } else { GLuint row_len = image->Width * image->TexFormat->TexelBytes; |