diff options
author | keithw <keithw> | 2000-02-27 20:39:22 +0000 |
---|---|---|
committer | keithw <keithw> | 2000-02-27 20:39:22 +0000 |
commit | fc8e2b7cfa27f8688f4354fba9be34222a6c8cea (patch) | |
tree | 1ad083e6248efc9af8bf8d1bb3cebedc187e2716 | |
parent | e39787a0c231f62c05a0a77733319e4892f47b3f (diff) |
add driver callbacks
-rw-r--r-- | xc/extras/Mesa/src/attrib.c | 4 | ||||
-rw-r--r-- | xc/extras/Mesa/src/dd.h | 2 | ||||
-rw-r--r-- | xc/extras/Mesa/src/lines.c | 3 | ||||
-rw-r--r-- | xc/extras/Mesa/src/polygon.c | 3 |
4 files changed, 11 insertions, 1 deletions
diff --git a/xc/extras/Mesa/src/attrib.c b/xc/extras/Mesa/src/attrib.c index b66bd4588..a2eaef98f 100644 --- a/xc/extras/Mesa/src/attrib.c +++ b/xc/extras/Mesa/src/attrib.c @@ -103,7 +103,7 @@ _mesa_PushAttrib(GLbitfield mask) ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPushAttrib"); if (MESA_VERBOSE&VERBOSE_API) - fprintf(stderr, "glPushAttrib %x\n", mask); + fprintf(stderr, "glPushAttrib %x\n", (int)mask); if (ctx->AttribStackDepth>=MAX_ATTRIB_STACK_DEPTH) { gl_error( ctx, GL_STACK_OVERFLOW, "glPushAttrib" ); @@ -674,6 +674,8 @@ _mesa_PopAttrib(void) break; case GL_POLYGON_STIPPLE_BIT: MEMCPY( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) ); + if (ctx->Driver.PolygonStipple) + ctx->Driver.PolygonStipple( ctx, attr->data ); break; case GL_SCISSOR_BIT: MEMCPY( &ctx->Scissor, attr->data, diff --git a/xc/extras/Mesa/src/dd.h b/xc/extras/Mesa/src/dd.h index 4ad434f26..9028c53d0 100644 --- a/xc/extras/Mesa/src/dd.h +++ b/xc/extras/Mesa/src/dd.h @@ -718,7 +718,9 @@ struct dd_function_table { void (*Lightfv)(GLcontext *ctx, GLenum light, GLenum pname, const GLfloat *params, GLint nparams ); void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params); + void (*LineStipple)(GLcontext *ctx, GLint factor, GLushort pattern ); void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode); + void (*PolygonStipple)(GLcontext *ctx, const GLubyte *mask ); void (*Scissor)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h); void (*ShadeModel)(GLcontext *ctx, GLenum mode); void (*ClearStencil)(GLcontext *ctx, GLint s); diff --git a/xc/extras/Mesa/src/lines.c b/xc/extras/Mesa/src/lines.c index 7e7e90cb6..e31899177 100644 --- a/xc/extras/Mesa/src/lines.c +++ b/xc/extras/Mesa/src/lines.c @@ -70,6 +70,9 @@ _mesa_LineStipple( GLint factor, GLushort pattern ) ctx->Line.StippleFactor = CLAMP( factor, 1, 256 ); ctx->Line.StipplePattern = pattern; ctx->NewState |= NEW_RASTER_OPS; + + if (ctx->Driver.LineStipple) + ctx->Driver.LineStipple( ctx, factor, pattern ); } diff --git a/xc/extras/Mesa/src/polygon.c b/xc/extras/Mesa/src/polygon.c index 50ce47b90..b082010df 100644 --- a/xc/extras/Mesa/src/polygon.c +++ b/xc/extras/Mesa/src/polygon.c @@ -149,6 +149,9 @@ _mesa_PolygonStipple( const GLubyte *mask ) if (ctx->Polygon.StippleFlag) { ctx->NewState |= NEW_RASTER_OPS; } + + if (ctx->Driver.PolygonStipple) + ctx->Driver.PolygonStipple( ctx, mask ); } |