rearranged order of some functions

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

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 924f75a74c9b5751ebe5903596645059b5f14cb4..4fd83dbd38f227db41705aae8f8f267103c95aa2 100644 (file)
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,4 +1,4 @@
-/* $Id: get.c,v 1.13 2000/02/17 20:53:48 brianp Exp $ */
+/* $Id: get.c,v 1.15 2000/03/11 23:23:26 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -122,16 +122,16 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_BLEND_SRC:
          *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_SRC_RGB_INGR:
+      case GL_BLEND_SRC_RGB_EXT:
          *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_DST_RGB_INGR:
+      case GL_BLEND_DST_RGB_EXT:
          *params = ENUM_TO_BOOL(ctx->Color.BlendDstRGB);
          break;
-      case GL_BLEND_SRC_ALPHA_INGR:
+      case GL_BLEND_SRC_ALPHA_EXT:
          *params = ENUM_TO_BOOL(ctx->Color.BlendSrcA);
          break;
-      case GL_BLEND_DST_ALPHA_INGR:
+      case GL_BLEND_DST_ALPHA_EXT:
          *params = ENUM_TO_BOOL(ctx->Color.BlendDstA);
          break;
       case GL_BLEND_EQUATION_EXT:
@@ -1012,8 +1012,26 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+         }
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = ctx->OcclusionResult;
+            ctx->OcclusionResult = GL_FALSE; /* reset now */
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+         }
+         return;
+
       default:
-        printf("invalid enum: %x\n", pname);
          gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
    }
 }
@@ -1084,16 +1102,16 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
       case GL_BLEND_SRC:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_SRC_RGB_INGR:
+      case GL_BLEND_SRC_RGB_EXT:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_DST_RGB_INGR:
+      case GL_BLEND_DST_RGB_EXT:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstRGB);
          break;
-      case GL_BLEND_SRC_ALPHA_INGR:
+      case GL_BLEND_SRC_ALPHA_EXT:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcA);
          break;
-      case GL_BLEND_DST_ALPHA_INGR:
+      case GL_BLEND_DST_ALPHA_EXT:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstA);
          break;
       case GL_BLEND_EQUATION_EXT:
@@ -1975,8 +1993,26 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
          }
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLdouble) ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+         }
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLdouble) ctx->OcclusionResult;
+            ctx->OcclusionResult = GL_FALSE; /* reset now */
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+         }
+         return;
+
       default:
-        printf("invalid enum: %x\n", pname);
          gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
    }
 }
@@ -2047,16 +2083,16 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
       case GL_BLEND_SRC:
          *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_SRC_RGB_INGR:
+      case GL_BLEND_SRC_RGB_EXT:
          *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_DST_RGB_INGR:
+      case GL_BLEND_DST_RGB_EXT:
          *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
          break;
-      case GL_BLEND_SRC_ALPHA_INGR:
+      case GL_BLEND_SRC_ALPHA_EXT:
          *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcA);
          break;
-      case GL_BLEND_DST_ALPHA_INGR:
+      case GL_BLEND_DST_ALPHA_EXT:
          *params = ENUM_TO_FLOAT(ctx->Color.BlendDstA);
          break;
       case GL_BLEND_EQUATION_EXT:
@@ -2915,8 +2951,26 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          gl_matrix_transposef(params, ctx->TextureMatrix[texTransformUnit].m);
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLfloat) ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+         }
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLfloat) ctx->OcclusionResult;
+            ctx->OcclusionResult = GL_FALSE; /* reset now */
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+         }
+         return;
+
       default:
-        printf("invalid enum: %x\n", pname);
          gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
    }
 }
@@ -2987,16 +3041,16 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_BLEND_SRC:
          *params = (GLint) ctx->Color.BlendSrcRGB;
          break;
-      case GL_BLEND_SRC_RGB_INGR:
+      case GL_BLEND_SRC_RGB_EXT:
          *params = (GLint) ctx->Color.BlendSrcRGB;
          break;
-      case GL_BLEND_DST_RGB_INGR:
+      case GL_BLEND_DST_RGB_EXT:
          *params = (GLint) ctx->Color.BlendDstRGB;
          break;
-      case GL_BLEND_SRC_ALPHA_INGR:
+      case GL_BLEND_SRC_ALPHA_EXT:
          *params = (GLint) ctx->Color.BlendSrcA;
          break;
-      case GL_BLEND_DST_ALPHA_INGR:
+      case GL_BLEND_DST_ALPHA_EXT:
          *params = (GLint) ctx->Color.BlendDstA;
          break;
       case GL_BLEND_EQUATION_EXT:
@@ -3878,8 +3932,26 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLint) ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+         }
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLint) ctx->OcclusionResult;
+            ctx->OcclusionResult = GL_FALSE; /* reset now */
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+         }
+         return;
+
       default:
-        printf("invalid enum: %x\n", pname);
          gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
    }
 }