[Mesa-dev] [PATCH] i965: Remove unused depth_mode parameter from translate_tex_format().

Kenneth Graunke kenneth at whitecape.org
Fri Dec 20 17:17:49 PST 2013


According to git blame, this hasn't been used in over two years:

    commit d2235b0f4681f75d562131d655a6d7b7033d2d8b
    Author: Eric Anholt <eric at anholt.net>
    Date:   Thu Nov 17 17:01:58 2011 -0800

        i965: Always handle GL_DEPTH_TEXTURE_MODE through the shader.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 src/mesa/drivers/dri/i965/brw_state.h             | 1 -
 src/mesa/drivers/dri/i965/brw_surface_formats.c   | 1 -
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  | 1 -
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index d3fd937..a148125 100644
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -193,7 +193,6 @@ GLuint translate_tex_target(GLenum target);
 
 GLuint translate_tex_format(struct brw_context *brw,
                             gl_format mesa_format,
-			    GLenum depth_mode,
 			    GLenum srgb_decode);
 
 int brw_get_texture_swizzle(const struct gl_context *ctx,
diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index 88fda8c..9b75c2b 100644
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -686,7 +686,6 @@ brw_render_target_supported(struct brw_context *brw,
 GLuint
 translate_tex_format(struct brw_context *brw,
                      gl_format mesa_format,
-		     GLenum depth_mode,
 		     GLenum srgb_decode)
 {
    struct gl_context *ctx = &brw->ctx;
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 01a4709..5236eda 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -289,7 +289,6 @@ brw_update_texture_surface(struct gl_context *ctx,
 	      BRW_SURFACE_CUBEFACE_ENABLES |
 	      (translate_tex_format(brw,
                                     mt->format,
-				    tObj->DepthMode,
 				    sampler->sRGBDecode) <<
 	       BRW_SURFACE_FORMAT_SHIFT));
 
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index dbd7309..761bc3b 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@ -291,7 +291,6 @@ gen7_update_texture_surface(struct gl_context *ctx,
 
    uint32_t tex_format = translate_tex_format(brw,
                                               mt->format,
-                                              tObj->DepthMode,
                                               sampler->sRGBDecode);
 
    if (for_gather && tex_format == BRW_SURFACEFORMAT_R32G32_FLOAT)
-- 
1.8.5.2



More information about the mesa-dev mailing list