fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 18:08:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965/fs: Rename fs_generator::prog to shader_prog

Browse source 
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>
This commit is contained in:
Jordan Justen 2014-09-02 20:41:48 -07:00
parent 000a9ee1ba
commit d0e166752a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_fs.h
View file

@ -575,7 +575,7 @@ public:
void *mem_ctx, void *mem_ctx,
const struct brw_wm_prog_key *key, const struct brw_wm_prog_key *key,
struct brw_wm_prog_data *prog_data, struct brw_wm_prog_data *prog_data,
struct gl_shader_program *prog, struct gl_shader_program *shader_prog,
struct gl_fragment_program *fp, struct gl_fragment_program *fp,
bool runtime_check_aads_emit, bool runtime_check_aads_emit,
bool debug_flag); bool debug_flag);
@ -683,7 +683,7 @@ private:
const struct brw_wm_prog_key *const key; const struct brw_wm_prog_key *const key;
struct brw_wm_prog_data *prog_data; 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; const struct gl_fragment_program *fp;
unsigned dispatch_width; /**< 8 or 16 */ unsigned dispatch_width; /**< 8 or 16 */

10
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
View file

@ -40,13 +40,13 @@ fs_generator::fs_generator(struct brw_context *brw,
void *mem_ctx, void *mem_ctx,
const struct brw_wm_prog_key *key, const struct brw_wm_prog_key *key,
struct brw_wm_prog_data *prog_data, struct brw_wm_prog_data *prog_data,
struct gl_shader_program *prog, struct gl_shader_program *shader_prog,
struct gl_fragment_program *fp, struct gl_fragment_program *fp,
bool runtime_check_aads_emit, bool runtime_check_aads_emit,
bool debug_flag) bool debug_flag)
: brw(brw), stage(MESA_SHADER_FRAGMENT), key(key), : 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), runtime_check_aads_emit(runtime_check_aads_emit),
debug_flag(debug_flag), mem_ctx(mem_ctx) 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; int after_size = p->next_insn_offset - start_offset;
if (unlikely(debug_flag)) { if (unlikely(debug_flag)) {
if (prog) { if (shader_prog) {
fprintf(stderr, fprintf(stderr,
"Native code for %s fragment shader %d (SIMD%d dispatch):\n", "Native code for %s fragment shader %d (SIMD%d dispatch):\n",
prog->Label ? prog->Label : "unnamed", shader_prog->Label ? shader_prog->Label : "unnamed",
prog->Name, dispatch_width); shader_prog->Name, dispatch_width);
} else if (fp) { } else if (fp) {
fprintf(stderr, fprintf(stderr,
"Native code for fragment program %d (SIMD%d dispatch):\n", "Native code for fragment program %d (SIMD%d dispatch):\n",