projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Use {} to initialize GENX_* structs.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_util.h
diff --git
a/src/mesa/drivers/dri/i965/brw_util.h
b/src/mesa/drivers/dri/i965/brw_util.h
index 04e4e944118ecae7d80cad371fe7d1523f3e71c3..095c43a88df1bcb5b95c2f2f2b0e8ba35bc64435 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_util.h
+++ b/
src/mesa/drivers/dri/i965/brw_util.h
@@
-33,15
+33,13
@@
#ifndef BRW_UTIL_H
#define BRW_UTIL_H
#ifndef BRW_UTIL_H
#define BRW_UTIL_H
-#include "main/mtypes.h"
-#include "main/imports.h"
#include "brw_context.h"
#include "brw_context.h"
+#include "main/framebuffer.h"
extern GLuint brw_translate_blend_factor( GLenum factor );
extern GLuint brw_translate_blend_equation( GLenum mode );
extern GLuint brw_translate_blend_factor( GLenum factor );
extern GLuint brw_translate_blend_equation( GLenum mode );
-extern GLenum brw_fix_xRGB_alpha(GLenum function);
-static inline
uint32_
t
+static inline
floa
t
brw_get_line_width(struct brw_context *brw)
{
/* From the OpenGL 4.4 spec:
brw_get_line_width(struct brw_context *brw)
{
/* From the OpenGL 4.4 spec:
@@
-51,16
+49,11
@@
brw_get_line_width(struct brw_context *brw)
* implementation-dependent maximum non-antialiased line width."
*/
float line_width =
* implementation-dependent maximum non-antialiased line width."
*/
float line_width =
- CLAMP(!
brw->ctx.Multisample._Enabled
&& !brw->ctx.Line.SmoothFlag
+ CLAMP(!
_mesa_is_multisample_enabled(&brw->ctx)
&& !brw->ctx.Line.SmoothFlag
? roundf(brw->ctx.Line.Width) : brw->ctx.Line.Width,
? roundf(brw->ctx.Line.Width) : brw->ctx.Line.Width,
- 0.0, brw->ctx.Const.MaxLineWidth);
- uint32_t line_width_u3_7 = U_FIXED(line_width, 7);
+ 0.125f, brw->ctx.Const.MaxLineWidth);
- /* Line width of 0 is not allowed when MSAA enabled */
- if (brw->ctx.Multisample._Enabled) {
- if (line_width_u3_7 == 0)
- line_width_u3_7 = 1;
- } else if (brw->ctx.Line.SmoothFlag && line_width < 1.5) {
+ if (!_mesa_is_multisample_enabled(&brw->ctx) && brw->ctx.Line.SmoothFlag && line_width < 1.5f) {
/* For 1 pixel line thickness or less, the general
* anti-aliasing algorithm gives up, and a garbage line is
* generated. Setting a Line Width of 0.0 specifies the
/* For 1 pixel line thickness or less, the general
* anti-aliasing algorithm gives up, and a garbage line is
* generated. Setting a Line Width of 0.0 specifies the
@@
-72,10
+65,10
@@
brw_get_line_width(struct brw_context *brw)
* bspec section 6.3.12.1 Zero-Width (Cosmetic) Line
* Rasterization.
*/
* bspec section 6.3.12.1 Zero-Width (Cosmetic) Line
* Rasterization.
*/
- line_width
_u3_7 = 0
;
+ line_width
= 0.0f
;
}
}
- return line_width
_u3_7
;
+ return line_width;
}
#endif
}
#endif