mesa: better debug messages in _mesa_test_texobj_completeness()

[mesa.git] / src / mesa / main / polygon.c

diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index dcde6758c3f7311bb34e0b4f9c039824859f61ec..addca0228d5092ebc00c8030da84681d40ff6047 100644 (file)
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -30,10 +30,11 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "bufferobj.h"
 #include "context.h"
 #include "image.h"
 #include "enums.h"
+#include "pack.h"
+#include "pbo.h"
 #include "polygon.h"
 #include "mtypes.h"
 
@@ -190,11 +191,12 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
  * too.
  */
 void
-_mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern)
+_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;
@@ -230,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);
@@ -240,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;
 
@@ -251,6 +253,13 @@ _mesa_GetPolygonStipple( GLubyte *dest )
 }
 
 
+void GLAPIENTRY
+_mesa_GetPolygonStipple( GLubyte *dest )
+{
+   _mesa_GetnPolygonStippleARB(INT_MAX, dest);
+}
+
+
 void GLAPIENTRY
 _mesa_PolygonOffset( GLfloat factor, GLfloat units )
 {
@@ -293,10 +302,10 @@ _mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
  *
  * \param ctx GL context.
  *
- * Initializes __GLcontextRec::Polygon and __GLcontextRec::PolygonStipple
+ * Initializes __struct gl_contextRec::Polygon and __struct gl_contextRec::PolygonStipple
  * attribute groups.
  */
-void _mesa_init_polygon( GLcontext * ctx )
+void _mesa_init_polygon( struct gl_context * ctx )
 {
    /* Polygon group */
    ctx->Polygon.CullFlag = GL_FALSE;
@@ -315,7 +324,7 @@ void _mesa_init_polygon( GLcontext * ctx )
 
 
    /* Polygon Stipple group */
-   MEMSET( ctx->PolygonStipple, 0xff, 32*sizeof(GLuint) );
+   memset( ctx->PolygonStipple, 0xff, 32*sizeof(GLuint) );
 }
 
 /*@}*/