fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-15 06:20:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: remove DD_LINE_STIPPLE flag

Browse source 
For the i915 driver, make it a local macro.
v2: use conditional operator instead of bit shifting

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Brian Paul 2013-04-16 19:06:22 -06:00
parent 55b2033f0a
commit 8ac8ae8360
5 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i915/intel_tris.c
View file

@ -944,6 +944,7 @@ intelFastRenderClippedPoly(struct gl_context * ctx, const GLuint * elts, GLuint
#define DD_LINE_STIPPLE (1 << 7)
#define ANY_FALLBACK_FLAGS (DD_LINE_STIPPLE | DD_TRI_STIPPLE | DD_POINT_ATTEN)
#define ANY_RASTER_FLAGS (DD_TRI_LIGHT_TWOSIDE | DD_TRI_OFFSET | DD_TRI_UNFILLED)
@ -953,7 +954,8 @@ intelChooseRenderState(struct gl_context * ctx)
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct intel_context *intel = intel_context(ctx);
GLuint flags = ctx->_TriangleCaps;
GLuint flags = ctx->_TriangleCaps |
(ctx->Line.StippleFlag ? DD_LINE_STIPPLE : 0);
const struct gl_fragment_program *fprog = ctx->FragmentProgram._Current;
bool have_wpos = (fprog && (fprog->Base.InputsRead & VARYING_BIT_POS));
GLuint index = 0;

3
src/mesa/main/debug.c
View file

@ -100,7 +100,7 @@ void
_mesa_print_tri_caps( const char *name, GLuint flags )
{
_mesa_debug(NULL,
"%s: (0x%x) %s%s%s%s%s%s%s%s\n",
"%s: (0x%x) %s%s%s%s%s%s%s\n",
name,
flags,
(flags & DD_TRI_LIGHT_TWOSIDE) ? "tri-light-twoside, " : "",
@ -108,7 +108,6 @@ _mesa_print_tri_caps( const char *name, GLuint flags )
(flags & DD_TRI_STIPPLE) ? "tri-stipple, " : "",
(flags & DD_TRI_OFFSET) ? "tri-offset, " : "",
(flags & DD_TRI_SMOOTH) ? "tri-smooth, " : "",
(flags & DD_LINE_STIPPLE) ? "line-stipple, " : "",
(flags & DD_POINT_SMOOTH) ? "point-smooth, " : "",
(flags & DD_POINT_ATTEN) ? "point-atten, " : ""
);

1
src/mesa/main/enable.c
View file

@ -439,7 +439,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
return;
FLUSH_VERTICES(ctx, _NEW_LINE);
ctx->Line.StippleFlag = state;
ctx->_TriangleCaps ^= DD_LINE_STIPPLE;
break;
case GL_INDEX_LOGIC_OP:
if (ctx->API != API_OPENGL_COMPAT)

1
src/mesa/main/mtypes.h
View file

@ -3172,7 +3172,6 @@ struct gl_matrix_stack
#define DD_TRI_SMOOTH (1 << 3)
#define DD_TRI_STIPPLE (1 << 4)
#define DD_TRI_OFFSET (1 << 5)
#define DD_LINE_STIPPLE (1 << 7)
#define DD_POINT_SMOOTH (1 << 8)
#define DD_POINT_ATTEN (1 << 9)
/*@}*/

8
src/mesa/main/state.c
View file

@ -352,14 +352,6 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state)
ctx->_TriangleCaps |= DD_POINT_ATTEN;
}
/*
* Lines
*/
if (1/*new_state & _NEW_LINE*/) {
if (ctx->Line.StippleFlag)
ctx->_TriangleCaps |= DD_LINE_STIPPLE;
}
/*
* Polygons
*/