replace color table FloatTable boolean with Type enum

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

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index f5d780e2ae289a582fd5e3d2c2b2866376a94839..745d7a304d93f2168b77891838da673f0a9c465e 100644 (file)
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,10 +1,8 @@
-/* $Id: drawpix.c,v 1.64 2003/03/01 01:50:20 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.0.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  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"),
@@ -34,17 +32,25 @@
 #include "state.h"
 #include "mtypes.h"
 
+#if _HAVE_FULL_GL
 
 /*
  * Execute glDrawPixels
  */
-void
+void GLAPIENTRY
 _mesa_DrawPixels( GLsizei width, GLsizei height,
                   GLenum format, GLenum type, const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   if (ctx->FragmentProgram.Enabled
+       && !ctx->FragmentProgram.Current->Instructions) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glDrawPixels (invalid fragment program)");
+      return;
+   }
+
    if (width < 0 || height < 0) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glDrawPixels(width or height < 0" );
       return;
@@ -87,36 +93,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
    }
 }
 
-
-
-void
-_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
-                 GLenum format, GLenum type, GLvoid *pixels )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE,
-                   "glReadPixels(width=%d height=%d)", width, height );
-      return;
-   }
-
-   if (!pixels) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glReadPixels(pixels)" );
-      return;
-   }
-
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   ctx->Driver.ReadPixels(ctx, x, y, width, height,
-                         format, type, &ctx->Pack, pixels);
-}
-
-
-
-void
+void GLAPIENTRY
 _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
                   GLenum type )
 {
@@ -124,6 +101,13 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
    GLint destx, desty;
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   if (ctx->FragmentProgram.Enabled
+       && !ctx->FragmentProgram.Current->Instructions) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCopyPixels (invalid fragment program)");
+      return;
+   }
+
    if (width < 0 || height < 0) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glCopyPixels(width or height < 0)" );
       return;
@@ -164,9 +148,40 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
    }
 }
 
+#endif
+
+
+
+void GLAPIENTRY
+_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
+                 GLenum format, GLenum type, GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE,
+                   "glReadPixels(width=%d height=%d)", width, height );
+      return;
+   }
 
-void
+   if (!pixels) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glReadPixels(pixels)" );
+      return;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   ctx->Driver.ReadPixels(ctx, x, y, width, height,
+                         format, type, &ctx->Pack, pixels);
+}
+
+
+
+
+
+void GLAPIENTRY
 _mesa_Bitmap( GLsizei width, GLsizei height,
               GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
               const GLubyte *bitmap )
@@ -174,6 +189,13 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   if (ctx->FragmentProgram.Enabled
+       && !ctx->FragmentProgram.Current->Instructions) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBitmap (invalid fragment program)");
+      return;
+   }
+
    if (width < 0 || height < 0) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glBitmap(width or height < 0)" );
       return;
@@ -197,6 +219,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
         ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
       }
    }
+#if _HAVE_FULL_GL
    else if (ctx->RenderMode==GL_FEEDBACK) {
       if (ctx->Current.RasterPosValid) {
         FLUSH_CURRENT(ctx, 0);
@@ -208,9 +231,11 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
                                ctx->Current.RasterTexCoords[0] );
       }
    }
-   else if (ctx->RenderMode==GL_SELECT) {
+   else {
+      ASSERT(ctx->RenderMode == GL_SELECT);
       /* Bitmaps don't generate selection hits.  See appendix B of 1.1 spec. */
    }
+#endif
 
    /* update raster position */
    ctx->Current.RasterPos[0] += xmove;
@@ -227,7 +252,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
  * Z-compositing.  Normally, this operation requires two glDrawPixels
  * calls with stencil testing.
  */
-void
+void GLAPIENTRY
 _mesa_DrawDepthPixelsMESA( GLsizei width, GLsizei height,
                            GLenum colorFormat, GLenum colorType,
                            const GLvoid *colors,