lots of gl_*() to _mesa_*() namespace clean-up

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

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index d9ed6a5173457282c7d11f8ff1309530b936a26a..806f3e2cd2919c828ff331ed1d45384c3c5a2318 100644 (file)
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -1,10 +1,10 @@
-/* $Id: feedback.c,v 1.17 2000/11/22 07:32:17 joukj Exp $ */
+/* $Id: feedback.c,v 1.22 2001/03/03 20:33:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
+ * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -52,69 +52,64 @@ void
 _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx, "glFeedbackBuffer" );
+   ASSERT_OUTSIDE_BEGIN_END(ctx); 
 
    if (ctx->RenderMode==GL_FEEDBACK) {
-      gl_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );
       return;
    }
-
    if (size<0) {
-      gl_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
       return;
    }
    if (!buffer) {
-      gl_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
-      ctx->Feedback.BufferSize = 0;
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
+      ctx->Feedback.BufferSize = 0; 
       return;
    }
 
    switch (type) {
       case GL_2D:
-        ctx->Feedback.Mask = 0;
-         ctx->Feedback.Type = type;
+        ctx->Feedback._Mask = 0;
         break;
       case GL_3D:
-        ctx->Feedback.Mask = FB_3D;
-         ctx->Feedback.Type = type;
+        ctx->Feedback._Mask = FB_3D;
         break;
       case GL_3D_COLOR:
-        ctx->Feedback.Mask = FB_3D
-                           | (ctx->Visual.RGBAflag ? FB_COLOR : FB_INDEX);
-         ctx->Feedback.Type = type;
+        ctx->Feedback._Mask = (FB_3D | 
+                               (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX));
         break;
       case GL_3D_COLOR_TEXTURE:
-        ctx->Feedback.Mask = FB_3D
-                           | (ctx->Visual.RGBAflag ? FB_COLOR : FB_INDEX)
-                          | FB_TEXTURE;
-         ctx->Feedback.Type = type;
+        ctx->Feedback._Mask = (FB_3D | 
+                               (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) | 
+                               FB_TEXTURE);
         break;
       case GL_4D_COLOR_TEXTURE:
-        ctx->Feedback.Mask = FB_3D | FB_4D
-                           | (ctx->Visual.RGBAflag ? FB_COLOR : FB_INDEX)
-                          | FB_TEXTURE;
-         ctx->Feedback.Type = type;
+        ctx->Feedback._Mask = (FB_3D | FB_4D | 
+                               (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
+                               FB_TEXTURE);
         break;
       default:
-        ctx->Feedback.Mask = 0;
-         gl_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
+        return;
    }
 
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); /* Always flush */
+   ctx->Feedback.Type = type;
    ctx->Feedback.BufferSize = size;
    ctx->Feedback.Buffer = buffer;
-   ctx->Feedback.Count = 0;
-   ctx->NewState |= _NEW_FEEDBACK_SELECT;
+   ctx->Feedback.Count = 0;                  /* Becaues of this. */
 }
 
 
-
 void
 _mesa_PassThrough( GLfloat token )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPassThrough");
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (ctx->RenderMode==GL_FEEDBACK) {
+      FLUSH_VERTICES(ctx, 0);
       FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_PASS_THROUGH_TOKEN );
       FEEDBACK_TOKEN( ctx, token );
    }
@@ -125,7 +120,7 @@ _mesa_PassThrough( GLfloat token )
 /*
  * Put a vertex into the feedback buffer.
  */
-void gl_feedback_vertex( GLcontext *ctx,
+void _mesa_feedback_vertex( GLcontext *ctx,
                          const GLfloat win[4],
                         const GLfloat color[4],
                         GLuint index,
@@ -133,22 +128,22 @@ void gl_feedback_vertex( GLcontext *ctx,
 {
    FEEDBACK_TOKEN( ctx, win[0] );
    FEEDBACK_TOKEN( ctx, win[1] );
-   if (ctx->Feedback.Mask & FB_3D) {
+   if (ctx->Feedback._Mask & FB_3D) {
       FEEDBACK_TOKEN( ctx, win[2] );
    }
-   if (ctx->Feedback.Mask & FB_4D) {
+   if (ctx->Feedback._Mask & FB_4D) {
       FEEDBACK_TOKEN( ctx, win[3] );
    }
-   if (ctx->Feedback.Mask & FB_INDEX) {
+   if (ctx->Feedback._Mask & FB_INDEX) {
       FEEDBACK_TOKEN( ctx, (GLfloat) index );
    }
-   if (ctx->Feedback.Mask & FB_COLOR) {
+   if (ctx->Feedback._Mask & FB_COLOR) {
       FEEDBACK_TOKEN( ctx, color[0] );
       FEEDBACK_TOKEN( ctx, color[1] );
       FEEDBACK_TOKEN( ctx, color[2] );
       FEEDBACK_TOKEN( ctx, color[3] );
    }
-   if (ctx->Feedback.Mask & FB_TEXTURE) {
+   if (ctx->Feedback._Mask & FB_TEXTURE) {
       FEEDBACK_TOKEN( ctx, texcoord[0] );
       FEEDBACK_TOKEN( ctx, texcoord[1] );
       FEEDBACK_TOKEN( ctx, texcoord[2] );
@@ -156,6 +151,7 @@ void gl_feedback_vertex( GLcontext *ctx,
    }
 }
 
+
 /**********************************************************************/
 /*                              Selection                             */
 /**********************************************************************/
@@ -168,19 +164,20 @@ void
 _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glSelectBuffer");
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    if (ctx->RenderMode==GL_SELECT) {
-      gl_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );
+      return;                  /* KW: added return */
    }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); /* why bother? */
    ctx->Select.Buffer = buffer;
    ctx->Select.BufferSize = size;
    ctx->Select.BufferCount = 0;
-
    ctx->Select.HitFlag = GL_FALSE;
    ctx->Select.HitMinZ = 1.0;
    ctx->Select.HitMaxZ = 0.0;
-
-   ctx->NewState |= _NEW_FEEDBACK_SELECT;
 }
 
 
@@ -192,7 +189,7 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
 
 
 
-void gl_update_hitflag( GLcontext *ctx, GLfloat z )
+void _mesa_update_hitflag( GLcontext *ctx, GLfloat z )
 {
    ctx->Select.HitFlag = GL_TRUE;
    if (z < ctx->Select.HitMinZ) {
@@ -235,7 +232,8 @@ void
 _mesa_InitNames( void )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glInitNames");
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
    /* Record the hit before the HitFlag is wiped out again. */
    if (ctx->RenderMode == GL_SELECT) {
       if (ctx->Select.HitFlag) {
@@ -246,7 +244,7 @@ _mesa_InitNames( void )
    ctx->Select.HitFlag = GL_FALSE;
    ctx->Select.HitMinZ = 1.0;
    ctx->Select.HitMaxZ = 0.0;
-   ctx->NewState |= _NEW_FEEDBACK_SELECT;
+   ctx->NewState |= _NEW_RENDERMODE;
 }
 
 
@@ -255,14 +253,18 @@ void
 _mesa_LoadName( GLuint name )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glLoadName");
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    if (ctx->RenderMode != GL_SELECT) {
       return;
    }
    if (ctx->Select.NameStackDepth == 0) {
-      gl_error( ctx, GL_INVALID_OPERATION, "glLoadName" );
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glLoadName" );
       return;
    }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+
    if (ctx->Select.HitFlag) {
       write_hit_record( ctx );
    }
@@ -272,7 +274,6 @@ _mesa_LoadName( GLuint name )
    else {
       ctx->Select.NameStack[MAX_NAME_STACK_DEPTH-1] = name;
    }
-   ctx->NewState |= _NEW_FEEDBACK_SELECT;
 }
 
 
@@ -280,20 +281,21 @@ void
 _mesa_PushName( GLuint name )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPushName");
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    if (ctx->RenderMode != GL_SELECT) {
       return;
    }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
    if (ctx->Select.HitFlag) {
       write_hit_record( ctx );
    }
-   if (ctx->Select.NameStackDepth < MAX_NAME_STACK_DEPTH) {
-      ctx->Select.NameStack[ctx->Select.NameStackDepth++] = name;
-   }
-   else {
-      gl_error( ctx, GL_STACK_OVERFLOW, "glPushName" );
+   if (ctx->Select.NameStackDepth >= MAX_NAME_STACK_DEPTH) {
+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushName" );
    }
-   ctx->NewState |= _NEW_FEEDBACK_SELECT;
+   else
+      ctx->Select.NameStack[ctx->Select.NameStackDepth++] = name;
 }
 
 
@@ -302,20 +304,21 @@ void
 _mesa_PopName( void )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPopName");
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    if (ctx->RenderMode != GL_SELECT) {
       return;
    }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
    if (ctx->Select.HitFlag) {
       write_hit_record( ctx );
    }
-   if (ctx->Select.NameStackDepth > 0) {
-      ctx->Select.NameStackDepth--;
-   }
-   else {
-      gl_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );
+   if (ctx->Select.NameStackDepth == 0) {
+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );
    }
-   ctx->NewState |= _NEW_FEEDBACK_SELECT;
+   else
+      ctx->Select.NameStackDepth--;
 }
 
 
@@ -334,12 +337,12 @@ _mesa_RenderMode( GLenum mode )
 {
    GET_CURRENT_CONTEXT(ctx);
    GLint result;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, "glRenderMode", 0);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
 
    if (MESA_VERBOSE & VERBOSE_API)
-      fprintf(stderr, "glRenderMode %s\n", gl_lookup_enum_by_nr(mode));
+      fprintf(stderr, "glRenderMode %s\n", _mesa_lookup_enum_by_nr(mode));
 
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
    ctx->_TriangleCaps &= ~(DD_FEEDBACK|DD_SELECT);
 
    switch (ctx->RenderMode) {
@@ -363,7 +366,6 @@ _mesa_RenderMode( GLenum mode )
         ctx->Select.BufferCount = 0;
         ctx->Select.Hits = 0;
         ctx->Select.NameStackDepth = 0;
-        ctx->NewState |= _NEW_FEEDBACK_SELECT;
         break;
       case GL_FEEDBACK:
         if (ctx->Feedback.Count > ctx->Feedback.BufferSize) {
@@ -374,10 +376,9 @@ _mesa_RenderMode( GLenum mode )
            result = ctx->Feedback.Count;
         }
         ctx->Feedback.Count = 0;
-        ctx->NewState |= _NEW_FEEDBACK_SELECT;
         break;
       default:
-        gl_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
+        _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
         return 0;
    }
 
@@ -388,23 +389,24 @@ _mesa_RenderMode( GLenum mode )
         ctx->_TriangleCaps |= DD_SELECT;
         if (ctx->Select.BufferSize==0) {
            /* haven't called glSelectBuffer yet */
-           gl_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
+           _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
         }
         break;
       case GL_FEEDBACK:
         ctx->_TriangleCaps |= DD_FEEDBACK;
         if (ctx->Feedback.BufferSize==0) {
            /* haven't called glFeedbackBuffer yet */
-           gl_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
+           _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
         }
         break;
       default:
-        gl_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
+        _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
         return 0;
    }
 
    ctx->RenderMode = mode;
-   ctx->NewState |= _NEW_RENDERMODE;
+   if (ctx->Driver.RenderMode) 
+      ctx->Driver.RenderMode( ctx, mode );
 
    return result;
 }