i965/vs: Rename vec4_generator::prog to shader_prog.

The next patch is going to change the type of vec4_generator::vp from
struct gl_vertex_program * to struct gl_program *, and rename it.  The
sensible name to change it to is vec4_generator::prog.  However, prog
is already used.  Since the existing vec4_generator::prog is of type
struct gl_shader_program, it makes sense to rename it to shader_prog.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
index 685154271e64f3e259feeec043dea8fdb0a183fb..152e4078a69f5076524cecb63a1924b0f9bcb88e 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -524,7 +524,7 @@ class vec4_generator
 public:
    vec4_generator(struct brw_context *brw,
                   struct brw_vs_compile *c,
-                  struct gl_shader_program *prog,
+                  struct gl_shader_program *shader_prog,
                   void *mem_ctx);
    ~vec4_generator();
 
@@ -585,7 +585,7 @@ private:
    struct brw_compile *p;
    struct brw_vs_compile *c;
 
-   struct gl_shader_program *prog;
+   struct gl_shader_program *shader_prog;
    struct gl_shader *shader;
    const struct gl_vertex_program *vp;
 

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
index 963901c029a234c93e77f4b21df50aebda280ad1..9f985b0b8ad1bd53462e618457b4d5bf9d10bf83 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
@@ -134,14 +134,14 @@ vec4_instruction::get_src(int i)
 
 vec4_generator::vec4_generator(struct brw_context *brw,
                                struct brw_vs_compile *c,
-                               struct gl_shader_program *prog,
+                               struct gl_shader_program *shader_prog,
                                void *mem_ctx)
-   : brw(brw), c(c), prog(prog), mem_ctx(mem_ctx)
+   : brw(brw), c(c), shader_prog(shader_prog), mem_ctx(mem_ctx)
 {
    intel = &brw->intel;
    vp = &c->vp->program;
 
-   shader = prog ? prog->_LinkedShaders[MESA_SHADER_VERTEX] : NULL;
+   shader = shader_prog ? shader_prog->_LinkedShaders[MESA_SHADER_VERTEX] : NULL;
 
    p = rzalloc(mem_ctx, struct brw_compile);
    brw_init_compile(brw, p, mem_ctx);
@@ -708,7 +708,7 @@ vec4_generator::generate_code(exec_list *instructions)
 
    if (unlikely(INTEL_DEBUG & DEBUG_VS)) {
       if (shader) {
-         printf("Native code for vertex shader %d:\n", prog->Name);
+         printf("Native code for vertex shader %d:\n", shader_prog->Name);
       } else {
          printf("Native code for vertex program %d:\n", c->vp->program.Base.Id);
       }