X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ffeedback.c;h=128a12622e8b9f091556afe012838d3638c03ae3;hb=ca5840afb0eae56f86668d0b5562c6d82fe8ad4b;hp=fcdbb75fc4fed0bebc9dad659930598b131e04cf;hpb=5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e;p=mesa.git

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index fcdbb75fc4f..128a12622e8 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -35,22 +35,19 @@
 #include "enums.h"
 #include "feedback.h"
 #include "macros.h"
+#include "mfeatures.h"
 #include "mtypes.h"
-#include "glapi/dispatch.h"
-
-
-#if FEATURE_feedback
+#include "main/dispatch.h"
 
 
 #define FB_3D		0x01
 #define FB_4D		0x02
-#define FB_INDEX	0x04
-#define FB_COLOR	0x08
-#define FB_TEXTURE	0X10
+#define FB_COLOR	0x04
+#define FB_TEXTURE	0X08
 
 
 
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -64,7 +61,7 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
       _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
       return;
    }
-   if (!buffer) {
+   if (!buffer && size > 0) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
       ctx->Feedback.BufferSize = 0;
       return;
@@ -78,18 +75,13 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
 	 ctx->Feedback._Mask = FB_3D;
 	 break;
       case GL_3D_COLOR:
-	 ctx->Feedback._Mask = (FB_3D |
-				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX));
+	 ctx->Feedback._Mask = (FB_3D | FB_COLOR);
 	 break;
       case GL_3D_COLOR_TEXTURE:
-	 ctx->Feedback._Mask = (FB_3D |
-				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
-				FB_TEXTURE);
+	 ctx->Feedback._Mask = (FB_3D | FB_COLOR | FB_TEXTURE);
 	 break;
       case GL_4D_COLOR_TEXTURE:
-	 ctx->Feedback._Mask = (FB_3D | FB_4D |
-				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
-				FB_TEXTURE);
+	 ctx->Feedback._Mask = (FB_3D | FB_4D | FB_COLOR | FB_TEXTURE);
 	 break;
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
@@ -104,7 +96,7 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
 }
 
 
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_PassThrough( GLfloat token )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -122,10 +114,9 @@ _mesa_PassThrough( GLfloat token )
  * Put a vertex into the feedback buffer.
  */
 void
-_mesa_feedback_vertex(GLcontext *ctx,
+_mesa_feedback_vertex(struct gl_context *ctx,
                       const GLfloat win[4],
                       const GLfloat color[4],
-                      GLfloat index,
                       const GLfloat texcoord[4])
 {
    _mesa_feedback_token( ctx, win[0] );
@@ -136,9 +127,6 @@ _mesa_feedback_vertex(GLcontext *ctx,
    if (ctx->Feedback._Mask & FB_4D) {
       _mesa_feedback_token( ctx, win[3] );
    }
-   if (ctx->Feedback._Mask & FB_INDEX) {
-      _mesa_feedback_token( ctx, (GLfloat) index );
-   }
    if (ctx->Feedback._Mask & FB_COLOR) {
       _mesa_feedback_token( ctx, color[0] );
       _mesa_feedback_token( ctx, color[1] );
@@ -169,14 +157,19 @@ _mesa_feedback_vertex(GLcontext *ctx,
  * \note this function can't be put in a display list.
  * 
  * Verifies we're not in selection mode, flushes the vertices and initialize
- * the fields in __GLcontextRec::Select with the given buffer.
+ * the fields in __struct gl_contextRec::Select with the given buffer.
  */
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
+   if (size < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSelectBuffer(size)");
+      return;
+   }
+
    if (ctx->RenderMode==GL_SELECT) {
       _mesa_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );
       return;			/* KW: added return */
@@ -201,8 +194,8 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
  * Verifies there is free space in the buffer to write the value and
  * increments the pointer.
  */
-static INLINE void
-write_record(GLcontext *ctx, GLuint value)
+static inline void
+write_record(struct gl_context *ctx, GLuint value)
 {
    if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
       ctx->Select.Buffer[ctx->Select.BufferCount] = value;
@@ -221,7 +214,7 @@ write_record(GLcontext *ctx, GLuint value)
  * gl_selection::HitMaxZ.
  */
 void
-_mesa_update_hitflag(GLcontext *ctx, GLfloat z)
+_mesa_update_hitflag(struct gl_context *ctx, GLfloat z)
 {
    ctx->Select.HitFlag = GL_TRUE;
    if (z < ctx->Select.HitMinZ) {
@@ -245,7 +238,7 @@ _mesa_update_hitflag(GLcontext *ctx, GLfloat z)
  * \sa gl_selection.
  */
 static void
-write_hit_record(GLcontext *ctx)
+write_hit_record(struct gl_context *ctx)
 {
    GLuint i;
    GLuint zmin, zmax, zscale = (~0u);
@@ -276,9 +269,9 @@ write_hit_record(GLcontext *ctx)
  *
  * Verifies we are in select mode and resets the name stack depth and resets
  * the hit record data in gl_selection. Marks new render mode in
- * __GLcontextRec::NewState.
+ * __struct gl_contextRec::NewState.
  */
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_InitNames( void )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -307,9 +300,9 @@ _mesa_InitNames( void )
  * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
  * and replace the top-most name in the stack.
  *
- * sa __GLcontextRec::Select.
+ * sa __struct gl_contextRec::Select.
  */
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_LoadName( GLuint name )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -346,9 +339,9 @@ _mesa_LoadName( GLuint name )
  * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
  * and adds the name to the top of the name stack.
  *
- * sa __GLcontextRec::Select.
+ * sa __struct gl_contextRec::Select.
  */
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_PushName( GLuint name )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -377,9 +370,9 @@ _mesa_PushName( GLuint name )
  * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
  * and removes top-most name in the name stack.
  *
- * sa __GLcontextRec::Select.
+ * sa __struct gl_contextRec::Select.
  */
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_PopName( void )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -419,10 +412,10 @@ _mesa_PopName( void )
  * Flushes the vertices and do the necessary cleanup according to the previous
  * rasterization mode, such as writing the hit record or resent the select
  * buffer index when exiting the select mode. Updates
- * __GLcontextRec::RenderMode and notifies the driver via the
+ * __struct gl_contextRec::RenderMode and notifies the driver via the
  * dd_function_table::RenderMode callback.
  */
-static GLint GLAPIENTRY
+GLint GLAPIENTRY
 _mesa_RenderMode( GLenum mode )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -456,7 +449,6 @@ _mesa_RenderMode( GLenum mode )
 	 ctx->Select.Hits = 0;
 	 ctx->Select.NameStackDepth = 0;
 	 break;
-#if _HAVE_FULL_GL
       case GL_FEEDBACK:
 	 if (ctx->Feedback.Count > ctx->Feedback.BufferSize) {
 	    /* overflow */
@@ -467,7 +459,6 @@ _mesa_RenderMode( GLenum mode )
 	 }
 	 ctx->Feedback.Count = 0;
 	 break;
-#endif
       default:
 	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
 	 return 0;
@@ -482,14 +473,12 @@ _mesa_RenderMode( GLenum mode )
 	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
 	 }
 	 break;
-#if _HAVE_FULL_GL
       case GL_FEEDBACK:
 	 if (ctx->Feedback.BufferSize==0) {
 	    /* haven't called glFeedbackBuffer yet */
 	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
 	 }
 	 break;
-#endif
       default:
 	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
 	 return 0;
@@ -505,23 +494,6 @@ _mesa_RenderMode( GLenum mode )
 /*@}*/
 
 
-void
-_mesa_init_feedback_dispatch(struct _glapi_table *disp)
-{
-   SET_InitNames(disp, _mesa_InitNames);
-   SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer);
-   SET_LoadName(disp, _mesa_LoadName);
-   SET_PassThrough(disp, _mesa_PassThrough);
-   SET_PopName(disp, _mesa_PopName);
-   SET_PushName(disp, _mesa_PushName);
-   SET_SelectBuffer(disp, _mesa_SelectBuffer);
-   SET_RenderMode(disp, _mesa_RenderMode);
-}
-
-
-#endif /* FEATURE_feedback */
-
-
 /**********************************************************************/
 /** \name Initialization */
 /*@{*/
@@ -529,7 +501,7 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp)
 /**
  * Initialize context feedback data.
  */
-void _mesa_init_feedback( GLcontext * ctx )
+void _mesa_init_feedback( struct gl_context * ctx )
 {
    /* Feedback */
    ctx->Feedback.Type = GL_2D;   /* TODO: verify */