diff options
author | Brian Paul <[email protected]> | 2014-12-01 13:41:47 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2014-12-01 16:30:12 -0700 |
commit | c407c6d58891dbb1fcdfc6ef17e6001b53d7e040 (patch) | |
tree | 6f8cea38e680d9c62f413bf0eeadc790f6e0899d | |
parent | f54162857c5fe354768cdbdeb38b379fcc26e600 (diff) |
mesa: inline/remove _mesa_polygon_stipple()
Was not called from any other place.
Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r-- | src/mesa/main/polygon.c | 38 | ||||
-rw-r--r-- | src/mesa/main/polygon.h | 4 |
2 files changed, 10 insertions, 32 deletions
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index 76d601977b1..cdaa2448334 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -176,19 +176,18 @@ _mesa_PolygonMode( GLenum face, GLenum mode ) /** - * This routine updates the ctx->Polygon.Stipple state. - * If we're getting the stipple data from a PBO, we map the buffer - * in order to access the data. - * In any case, we obey the current pixel unpacking parameters when fetching - * the stipple data. - * - * In the future, this routine should be used as a fallback, called via - * ctx->Driver.PolygonStipple(). We'll have to update all the DRI drivers - * too. + * Called by glPolygonStipple. */ -void -_mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern) +void GLAPIENTRY +_mesa_PolygonStipple(const GLubyte *pattern) { + GET_CURRENT_CONTEXT(ctx); + + if (MESA_VERBOSE & VERBOSE_API) + _mesa_debug(ctx, "glPolygonStipple\n"); + + FLUSH_VERTICES(ctx, _NEW_POLYGONSTIPPLE); + pattern = _mesa_map_validate_pbo_source(ctx, 2, &ctx->Unpack, 32, 32, 1, GL_COLOR_INDEX, GL_BITMAP, @@ -200,23 +199,6 @@ _mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern) _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack); _mesa_unmap_pbo_source(ctx, &ctx->Unpack); -} - - -/** - * Called by glPolygonStipple. - */ -void GLAPIENTRY -_mesa_PolygonStipple( const GLubyte *pattern ) -{ - GET_CURRENT_CONTEXT(ctx); - - if (MESA_VERBOSE&VERBOSE_API) - _mesa_debug(ctx, "glPolygonStipple\n"); - - FLUSH_VERTICES(ctx, _NEW_POLYGONSTIPPLE); - - _mesa_polygon_stipple(ctx, pattern); if (ctx->Driver.PolygonStipple) ctx->Driver.PolygonStipple(ctx, pattern); diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h index 69c5cbc459f..530adba4cb4 100644 --- a/src/mesa/main/polygon.h +++ b/src/mesa/main/polygon.h @@ -39,10 +39,6 @@ struct gl_context; extern void GLAPIENTRY _mesa_GetnPolygonStippleARB( GLsizei bufSize, GLubyte *dest ); -extern void -_mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern); - - extern void GLAPIENTRY _mesa_CullFace( GLenum mode ); |