KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/fs: Don't store gl_fragment_program* in fs_generator 

gl_program* is named prog similar to backend_visitor.

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-08-29 12:50:46 -07:00
parent 936ca6f3cf
commit f96a02c7ca
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_fs.h
View File

@ -684,7 +684,7 @@ private:
struct brw_wm_prog_data *prog_data; struct brw_wm_prog_data *prog_data;
struct gl_shader_program * const shader_prog; struct gl_shader_program * const shader_prog;
const struct gl_fragment_program *fp; const struct gl_program *prog;
unsigned dispatch_width; /**< 8 or 16 */ unsigned dispatch_width; /**< 8 or 16 */

13
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
View File

@ -46,7 +46,7 @@ fs_generator::fs_generator(struct brw_context *brw,
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), shader_prog(shader_prog), fp(fp), prog_data(prog_data), shader_prog(shader_prog), prog(&fp->Base),
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)
{ {
@ -145,6 +145,8 @@ fs_generator::fire_fb_write(fs_inst *inst,
void void
fs_generator::generate_fb_write(fs_inst *inst) fs_generator::generate_fb_write(fs_inst *inst)
{ {
assert(stage == MESA_SHADER_FRAGMENT);
gl_fragment_program *fp = (gl_fragment_program *) prog;
struct brw_reg implied_header; struct brw_reg implied_header;
/* Header is 2 regs, g0 and g1 are the contents. g0 will be implied /* Header is 2 regs, g0 and g1 are the contents. g0 will be implied
@ -1808,7 +1810,8 @@ fs_generator::generate_code(const cfg_t *cfg)
/* Make sure fp->UsesDFdy flag got set (otherwise there's no /* Make sure fp->UsesDFdy flag got set (otherwise there's no
* guarantee that key->render_to_fbo is set). * guarantee that key->render_to_fbo is set).
*/ */
assert(fp->UsesDFdy); assert(stage == MESA_SHADER_FRAGMENT &&
((gl_fragment_program *) prog)->UsesDFdy);
generate_ddy(inst, dst, src[0], src[1], key->render_to_fbo); generate_ddy(inst, dst, src[0], src[1], key->render_to_fbo);
break; break;
@ -1961,10 +1964,10 @@ fs_generator::generate_code(const cfg_t *cfg)
"Native code for %s fragment shader %d (SIMD%d dispatch):\n", "Native code for %s fragment shader %d (SIMD%d dispatch):\n",
shader_prog->Label ? shader_prog->Label : "unnamed", shader_prog->Label ? shader_prog->Label : "unnamed",
shader_prog->Name, dispatch_width); shader_prog->Name, dispatch_width);
} else if (fp) { } else if (prog) {
fprintf(stderr, fprintf(stderr,
"Native code for fragment program %d (SIMD%d dispatch):\n", "Native code for fragment program %d (SIMD%d dispatch):\n",
fp->Base.Id, dispatch_width); prog->Id, dispatch_width);
} else { } else {
fprintf(stderr, "Native code for blorp program (SIMD%d dispatch):\n", fprintf(stderr, "Native code for blorp program (SIMD%d dispatch):\n",
dispatch_width); dispatch_width);
@ -1974,8 +1977,6 @@ fs_generator::generate_code(const cfg_t *cfg)
dispatch_width, before_size / 16, loop_count, before_size, after_size, dispatch_width, before_size / 16, loop_count, before_size, after_size,
100.0f * (before_size - after_size) / before_size); 100.0f * (before_size - after_size) / before_size);
const struct gl_program *prog = fp ? &fp->Base : NULL;
dump_assembly(p->store, annotation.ann_count, annotation.ann, brw, prog); dump_assembly(p->store, annotation.ann_count, annotation.ann, brw, prog);
ralloc_free(annotation.ann); ralloc_free(annotation.ann);
} }