fixed glitches in error checking of imaging extensions

1 files changed, 11 insertions, 11 deletions

diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index dddaac3935..de5348deb4 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -1,4 +1,4 @@
-/* $Id: histogram.c,v 1.7 2001/02/17 18:41:01 brianp Exp $ */
+/* $Id: histogram.c,v 1.8 2001/02/27 22:33:59 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -602,7 +602,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
       return;
    }
@@ -669,7 +669,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
       return;
    }
@@ -732,7 +732,7 @@ _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
       return;
    }
@@ -779,7 +779,7 @@ _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
       return;
    }
@@ -826,7 +826,7 @@ _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv");
       return;
    }
@@ -852,7 +852,7 @@ _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
       return;
    }
@@ -880,7 +880,7 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glHistogram");
       return;
    }
@@ -961,7 +961,7 @@ _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glMinmax");
       return;
    }
@@ -990,7 +990,7 @@ _mesa_ResetHistogram(GLenum target)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
       return;
    }
@@ -1017,7 +1017,7 @@ _mesa_ResetMinmax(GLenum target)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       gl_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
       return;
    }