Mesa (master): i915: Drop dead argument to translate_texture_format().
Eric Anholt
anholt at kemper.freedesktop.org
Tue Jun 14 18:24:24 UTC 2011
Module: Mesa
Branch: master
Commit: afbe605eff5af3739a76705a04a3c97a53c81b0d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=afbe605eff5af3739a76705a04a3c97a53c81b0d
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jun 9 09:58:38 2011 -0700
i915: Drop dead argument to translate_texture_format().
---
src/mesa/drivers/dri/i915/i830_texstate.c | 5 ++---
src/mesa/drivers/dri/i915/i915_texstate.c | 4 +---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c
index 3298dbb..d4af5e5 100644
--- a/src/mesa/drivers/dri/i915/i830_texstate.c
+++ b/src/mesa/drivers/dri/i915/i830_texstate.c
@@ -40,7 +40,7 @@
static GLuint
-translate_texture_format(GLuint mesa_format, GLuint internal_format)
+translate_texture_format(GLuint mesa_format)
{
switch (mesa_format) {
case MESA_FORMAT_L8:
@@ -156,8 +156,7 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
*/
i830->state.tex_offset[unit] = dst_x * intelObj->mt->cpp + dst_y * pitch;
- format = translate_texture_format(firstImage->TexFormat,
- firstImage->InternalFormat);
+ format = translate_texture_format(firstImage->TexFormat);
state[I830_TEXREG_TM0LI] = (_3DSTATE_LOAD_STATE_IMMEDIATE_2 |
(LOAD_TEXTURE_MAP0 << unit) | 4);
diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index 5aa2ea1..bcf42d5 100644
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -39,8 +39,7 @@
static GLuint
-translate_texture_format(gl_format mesa_format, GLuint internal_format,
- GLenum DepthMode)
+translate_texture_format(gl_format mesa_format, GLenum DepthMode)
{
switch (mesa_format) {
case MESA_FORMAT_L8:
@@ -165,7 +164,6 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
i915->state.tex_offset[unit] = 0; /* Always the origin of the miptree */
format = translate_texture_format(firstImage->TexFormat,
- firstImage->InternalFormat,
sampler->DepthMode);
pitch = intelObj->mt->region->pitch * intelObj->mt->cpp;
More information about the mesa-commit
mailing list