diff options
| author | Kenneth Graunke <[email protected]> | 2017-05-08 22:39:25 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2017-05-10 11:41:42 -0700 |
| commit | 774db15aaf6dc5a2331f9323328f92152547bb13 (patch) | |
| tree | 8ce08f6b05ed17347b5847d2f33219d09634db90 | |
| parent | 620f12a53f9de09fa122912c8bb07e82332b565d (diff) | |
i965: Turn brw_get_line_width_float() into brw_get_line_width().
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.
Reviewed-by: Rafael Antognolli <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_util.h | 10 | ||||
| -rw-r--r-- | 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) { |