diff options
| author | Jordan Justen <[email protected]> | 2014-09-02 20:41:48 -0700 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2014-09-05 22:15:06 -0700 |
| commit | d0e166752adce3f8d4e777100a01928651182a4e (patch) | |
| tree | ea4addfcd4f0ac3defa39e32bc4b62df3320ed64 /src/mesa/drivers/dri | |
| parent | 000a9ee1ba5b1ac1278af6f8d20c8873f9ea8701 (diff) | |
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 <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index 846efc7d3c0..3a916fea7bc 100644 --- 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 558e4931b10..068f079191b 100644 --- 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", |