On Tue, May 09, 2017 at 04:10:26PM -0700, Kenneth Graunke wrote: > Drop the old brw_get_line_width() helper which return the unsigned > fixed-point encoding of the line width - it's been dead since the > conversion to GENXML (which does the encoding for us). > > Then rename brw_get_line_width_float() to the shorter name.
Hmm... I should have looked for other users of this function before creating the _float() version. Reviewed-by: Rafael Antognolli <rafael.antogno...@intel.com> > --- > src/mesa/drivers/dri/i965/brw_util.h | 10 +--------- > src/mesa/drivers/dri/i965/genX_state_upload.c | 6 +++--- > 2 files changed, 4 insertions(+), 12 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_util.h > b/src/mesa/drivers/dri/i965/brw_util.h > index 7395d345a57..814286007de 100644 > --- a/src/mesa/drivers/dri/i965/brw_util.h > +++ b/src/mesa/drivers/dri/i965/brw_util.h > @@ -41,7 +41,7 @@ extern GLuint brw_translate_blend_equation( GLenum mode ); > extern GLenum brw_fix_xRGB_alpha(GLenum function); > > static inline float > -brw_get_line_width_float(struct brw_context *brw) > +brw_get_line_width(struct brw_context *brw) > { > /* From the OpenGL 4.4 spec: > * > @@ -72,12 +72,4 @@ brw_get_line_width_float(struct brw_context *brw) > return line_width; > } > > -static inline uint32_t > -brw_get_line_width(struct brw_context *brw) > -{ > - float line_width = brw_get_line_width_float(brw); > - > - return U_FIXED(line_width, 7); > -} > - > #endif > diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c > b/src/mesa/drivers/dri/i965/genX_state_upload.c > index 77b9f93b5e3..ebfcdd46e04 100644 > --- a/src/mesa/drivers/dri/i965/genX_state_upload.c > +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c > @@ -1405,11 +1405,11 @@ genX(upload_sf)(struct brw_context *brw) > /* _NEW_LINE */ > #if GEN_GEN == 8 > if (brw->is_cherryview) > - sf.CHVLineWidth = brw_get_line_width_float(brw); > + sf.CHVLineWidth = brw_get_line_width(brw); > else > - sf.LineWidth = brw_get_line_width_float(brw); > + sf.LineWidth = brw_get_line_width(brw); > #else > - sf.LineWidth = brw_get_line_width_float(brw); > + sf.LineWidth = brw_get_line_width(brw); > #endif > > if (ctx->Line.SmoothFlag) { > -- > 2.12.2 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev