diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-27 15:56:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-27 15:56:59 +0000 |
| commit | 100633b3e7619842f345cb7603b0db6b5761dd11 (patch) | |
| tree | 3c3af754c7e801c07263269837d6a05072ff834c /mesalib/src/mesa/main/polygon.c | |
| parent | 205a4bdae76f287126db9f45a4f0ba631e3efca1 (diff) | |
| parent | 96d6df5da9cddedf4931bf8e17f96e242467c661 (diff) | |
| download | vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.tar.gz vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.tar.bz2 vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/polygon.c')
| -rw-r--r-- | mesalib/src/mesa/main/polygon.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/polygon.c b/mesalib/src/mesa/main/polygon.c index 3ad375901..fc64cf4a0 100644 --- a/mesalib/src/mesa/main/polygon.c +++ b/mesalib/src/mesa/main/polygon.c @@ -195,7 +195,8 @@ _mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern) {
pattern = _mesa_map_validate_pbo_source(ctx, 2,
&ctx->Unpack, 32, 32, 1,
- GL_COLOR_INDEX, GL_BITMAP, pattern,
+ GL_COLOR_INDEX, GL_BITMAP,
+ INT_MAX, pattern,
"glPolygonStipple");
if (!pattern)
return;
@@ -231,7 +232,7 @@ _mesa_PolygonStipple( const GLubyte *pattern ) * Called by glPolygonStipple.
*/
void GLAPIENTRY
-_mesa_GetPolygonStipple( GLubyte *dest )
+_mesa_GetnPolygonStippleARB( GLsizei bufSize, GLubyte *dest )
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -241,8 +242,8 @@ _mesa_GetPolygonStipple( GLubyte *dest ) dest = _mesa_map_validate_pbo_dest(ctx, 2,
&ctx->Pack, 32, 32, 1,
- GL_COLOR_INDEX, GL_BITMAP, dest,
- "glGetPolygonStipple");
+ GL_COLOR_INDEX, GL_BITMAP,
+ bufSize, dest, "glGetPolygonStipple");
if (!dest)
return;
@@ -253,6 +254,13 @@ _mesa_GetPolygonStipple( GLubyte *dest ) void GLAPIENTRY
+_mesa_GetPolygonStipple( GLubyte *dest )
+{
+ _mesa_GetnPolygonStippleARB(INT_MAX, dest);
+}
+
+
+void GLAPIENTRY
_mesa_PolygonOffset( GLfloat factor, GLfloat units )
{
GET_CURRENT_CONTEXT(ctx);
|