On Monday, September 01, 2014 09:44:37 AM Jordan Justen wrote: > Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> > --- > src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- > src/mesa/drivers/dri/i965/brw_scalar.h | 4 ++-- > src/mesa/drivers/dri/i965/brw_scalar_generator.cpp | 10 +++++----- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp > b/src/mesa/drivers/dri/i965/brw_fs.cpp > index 5c1e31e..8e062d3 100644 > --- a/src/mesa/drivers/dri/i965/brw_fs.cpp > +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp > @@ -3440,7 +3440,7 @@ brw_wm_fs_emit(struct brw_context *brw, > } > > const unsigned *assembly = NULL; > - scalar_generator g(brw, mem_ctx, &key->base, prog_data, prog, fp, > + scalar_generator g(brw, mem_ctx, &key->base, prog_data, prog, &fp->Base, > v.runtime_check_aads_emit, INTEL_DEBUG & DEBUG_WM); > assembly = g.generate_assembly(simd8_cfg, simd16_cfg, > final_assembly_size); > diff --git a/src/mesa/drivers/dri/i965/brw_scalar.h > b/src/mesa/drivers/dri/i965/brw_scalar.h > index d19ab56..13c889b 100644 > --- a/src/mesa/drivers/dri/i965/brw_scalar.h > +++ b/src/mesa/drivers/dri/i965/brw_scalar.h > @@ -588,7 +588,7 @@ public: > const struct brw_scalar_prog_key *key, > struct brw_scalar_prog_data *prog_data, > struct gl_shader_program *prog, > - struct gl_fragment_program *fp, > + struct gl_program *glp, > bool runtime_check_aads_emit, > bool debug_flag); > ~scalar_generator(); > @@ -695,7 +695,7 @@ private: > struct brw_scalar_prog_data *prog_data; > > struct gl_shader_program *prog; > - const struct gl_fragment_program *fp; > + const struct gl_program *glp;
I would like to see this be: const struct gl_program *prog; which is the traditional name for gl_program structures. "glp" is a new name we haven't used before. That does mean slightly more work - you'd have to rename the existing "prog" to const struct gl_shader_program *shader_prog; which would be worth doing anyway, IMHO, because then vec4_visitor and fs_visitor would both use identical names for the two structures, reducing confusion.
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
