On Thu, Dec 04, 2014 at 10:02:25PM -0800, Kristian Høgsberg wrote: > Now that the caller passes in the shader debug name, we don't need this > anymore. > > Signed-off-by: Kristian Høgsberg <[email protected]>
Up through here all looks fine to me. I do like Jason's suggestion for patch 1. (I also don't really see the need to have 2-4 as separate patches, but as you like). 1-4: Reviewed-by: Ben Widawsky <[email protected]> > --- > src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp | 2 +- > src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- > src/mesa/drivers/dri/i965/brw_fs.h | 2 -- > src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 3 +-- > 4 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp > b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp > index f6d0b68..83fccc2 100644 > --- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp > +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp > @@ -31,7 +31,7 @@ brw_blorp_eu_emitter::brw_blorp_eu_emitter(struct > brw_context *brw, > : mem_ctx(ralloc_context(NULL)), > generator(brw, mem_ctx, (void *) rzalloc(mem_ctx, struct > brw_wm_prog_key), > (struct brw_stage_prog_data *) rzalloc(mem_ctx, struct > brw_wm_prog_data), > - NULL, NULL, false) > + NULL, false) > { > if (debug_flag) > generator.enable_debug("blorp"); > diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp > b/src/mesa/drivers/dri/i965/brw_fs.cpp > index 8501f72..fe09630 100644 > --- a/src/mesa/drivers/dri/i965/brw_fs.cpp > +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp > @@ -3717,7 +3717,7 @@ brw_wm_fs_emit(struct brw_context *brw, > prog_data->no_8 = false; > } > > - fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base, prog, > + fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base, > &fp->Base, v.runtime_check_aads_emit); > > if (unlikely(INTEL_DEBUG & DEBUG_WM)) { > diff --git a/src/mesa/drivers/dri/i965/brw_fs.h > b/src/mesa/drivers/dri/i965/brw_fs.h > index 20c6059..5360b1c 100644 > --- a/src/mesa/drivers/dri/i965/brw_fs.h > +++ b/src/mesa/drivers/dri/i965/brw_fs.h > @@ -682,7 +682,6 @@ public: > void *mem_ctx, > const void *key, > struct brw_stage_prog_data *prog_data, > - struct gl_shader_program *shader_prog, > struct gl_program *fp, > bool runtime_check_aads_emit); > ~fs_generator(); > @@ -788,7 +787,6 @@ private: > const void * const key; > struct brw_stage_prog_data * const prog_data; > > - struct gl_shader_program * const shader_prog; > const struct gl_program *prog; > > 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 602595a..c2d83bf 100644 > --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp > +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp > @@ -40,12 +40,11 @@ fs_generator::fs_generator(struct brw_context *brw, > void *mem_ctx, > const void *key, > struct brw_stage_prog_data *prog_data, > - struct gl_shader_program *shader_prog, > struct gl_program *prog, > bool runtime_check_aads_emit) > > : brw(brw), key(key), > - prog_data(prog_data), shader_prog(shader_prog), > + prog_data(prog_data), > prog(prog), runtime_check_aads_emit(runtime_check_aads_emit), > debug_flag(false), mem_ctx(mem_ctx) > { > -- > 2.2.0 > > _______________________________________________ > mesa-dev mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
