i965/fs: Rename fs_generator::prog to shader_prog

This matches backend_visitor, and will allow gl_program to be named prog.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 846efc7d3c09f3df0efaca5de65e62fdce5e90b9..3a916fea7bc76eb18de717fff201dc28579ad56f 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -575,7 +575,7 @@ public:
                 void *mem_ctx,
                 const struct brw_wm_prog_key *key,
                 struct brw_wm_prog_data *prog_data,
-                struct gl_shader_program *prog,
+                struct gl_shader_program *shader_prog,
                 struct gl_fragment_program *fp,
                 bool runtime_check_aads_emit,
                 bool debug_flag);
@@ -683,7 +683,7 @@ private:
    const struct brw_wm_prog_key *const key;
    struct brw_wm_prog_data *prog_data;
 
-   struct gl_shader_program *prog;
+   struct gl_shader_program * const shader_prog;
    const struct gl_fragment_program *fp;
 
    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 558e4931b1035519a4f7b5890c4de0749ca9816a..068f079191b17beedd70c10843fb3960b3f59512 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -40,13 +40,13 @@ fs_generator::fs_generator(struct brw_context *brw,
                            void *mem_ctx,
                            const struct brw_wm_prog_key *key,
                            struct brw_wm_prog_data *prog_data,
-                           struct gl_shader_program *prog,
+                           struct gl_shader_program *shader_prog,
                            struct gl_fragment_program *fp,
                            bool runtime_check_aads_emit,
                            bool debug_flag)
 
    : brw(brw), stage(MESA_SHADER_FRAGMENT), key(key),
-     prog_data(prog_data), prog(prog), fp(fp),
+     prog_data(prog_data), shader_prog(shader_prog), fp(fp),
      runtime_check_aads_emit(runtime_check_aads_emit),
      debug_flag(debug_flag), mem_ctx(mem_ctx)
 {
@@ -1956,11 +1956,11 @@ fs_generator::generate_code(const cfg_t *cfg)
    int after_size = p->next_insn_offset - start_offset;
 
    if (unlikely(debug_flag)) {
-      if (prog) {
+      if (shader_prog) {
          fprintf(stderr,
                  "Native code for %s fragment shader %d (SIMD%d dispatch):\n",
-                 prog->Label ? prog->Label : "unnamed",
-                 prog->Name, dispatch_width);
+                 shader_prog->Label ? shader_prog->Label : "unnamed",
+                 shader_prog->Name, dispatch_width);
       } else if (fp) {
          fprintf(stderr,
                  "Native code for fragment program %d (SIMD%d dispatch):\n",