i965: Remove shader program argument and member from fs_generator

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

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

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 f6d0b68768d61c7ddf44237476f2a2a274de04d6..83fccc2a98bca029682435531997f2bfd92057b2 100644 (file)
--- 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 feca1e7f7ab92d71c908e7f827eea5707a63ef0c..a0fb56539988d8e56fec9390810bfa5886692409 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3716,7 +3716,7 @@ brw_wm_fs_emit(struct brw_context *brw,
       prog_data->no_8 = false;
    }
 
-   fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base, prog,
+   fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base,
                   &fp->Base, v.runtime_check_aads_emit);
 
    if (unlikely(INTEL_DEBUG & DEBUG_WM)) {

diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index ce9f3b8a66291a6374719fa8d5740d71eaf1bf93..f0e6f251dbb6aff7a8691a1f0609063f8e9d63be 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -691,7 +691,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();
@@ -797,7 +796,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 1d88fda109c8b08f88745b016395ca730eb25fec..95bdfc1b6aa9200bea7de2d7e3af806899a06e19 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -124,12 +124,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)
 {