[Mesa-dev] [PATCH 04/14] i965: Remove shader program argument and member from fs_generator

[Kristian Høgsberg]

Now that the caller passes in the shader debug name, we don't need this
anymore.

Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
---
 src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp | 2 +-
 src/mesa/drivers/dri/i965/brw_fs.cpp            | 2 +-
 src/mesa/drivers/dri/i965/brw_fs.h              | 2 --
 src/mesa/drivers/dri/i965/brw_fs_generator.cpp  | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
index e55ffcd..36d36f8 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
@@ -31,7 +31,7 @@ brw_blorp_eu_emitter::brw_blorp_eu_emitter(struct brw_context *brw,
    : mem_ctx(ralloc_context(NULL)),
      generator(brw, mem_ctx, (void *) rzalloc(mem_ctx, struct brw_wm_prog_key),
                (struct brw_stage_prog_data *) rzalloc(mem_ctx, struct brw_wm_prog_data),
-               NULL, NULL, false)
+               NULL, false)
 {
    if (debug_flag)
       generator.enable_debug("blorp");
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 6b9f3b5..97fefff 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3744,7 +3744,7 @@ brw_wm_fs_emit(struct brw_context *brw,
    }
 
    const unsigned *assembly = NULL;
-   fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base, prog, &fp->Base,
+   fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base, &fp->Base,
                   v.runtime_check_aads_emit);
    assembly = g.generate_assembly(simd8_cfg, simd16_cfg,
                                   final_assembly_size);
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 3986745..117b765 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -696,7 +696,6 @@ public:
                 void *mem_ctx,
                 const void *key,
                 struct brw_stage_prog_data *prog_data,
-                struct gl_shader_program *shader_prog,
                 struct gl_program *fp,
                 bool runtime_check_aads_emit);
    ~fs_generator();
@@ -805,7 +804,6 @@ private:
    const void * const key;
    struct brw_stage_prog_data * const prog_data;
 
-   struct gl_shader_program * const shader_prog;
    const struct gl_program *prog;
 
    unsigned dispatch_width; /**< 8 or 16 */
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index ee0b818..cb1d922 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -40,12 +40,11 @@ fs_generator::fs_generator(struct brw_context *brw,
                            void *mem_ctx,
                            const void *key,
                            struct brw_stage_prog_data *prog_data,
-                           struct gl_shader_program *shader_prog,
                            struct gl_program *prog,
                            bool runtime_check_aads_emit)
 
    : brw(brw), key(key),
-     prog_data(prog_data), shader_prog(shader_prog),
+     prog_data(prog_data),
      prog(prog), runtime_check_aads_emit(runtime_check_aads_emit),
      debug_flag(false), mem_ctx(mem_ctx)
 {
-- 
2.1.0