summaryrefslogtreecommitdiff
path: root/src/mesa/main/histogram.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-09-09 15:53:55 -0700
committerEric Anholt <eric@anholt.net>2010-09-23 13:25:45 -0700
commit907a6734fcd427a6ac6fe5fcfbeac5d6054d82ae (patch)
treeab43a153223b5c110311ff36d1db7003e06f35e5 /src/mesa/main/histogram.c
parent96da9b28c838af00f15d6c0a5973857019d3aecc (diff)
mesa: Remove the non-required ARB_imaging extension.
Many of the EXT_ extensions in the subset have significant code overhead with no users. It is not a required part of GL -- though text describing the extension is part of the core spec since 1.2, it is always conditional on the ARB_imaging extension.
Diffstat (limited to 'src/mesa/main/histogram.c')
-rw-r--r--src/mesa/main/histogram.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 4e482bcd54..db3cbfc5a9 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -629,7 +629,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 && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
return;
}
@@ -692,7 +692,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 && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
return;
}
@@ -752,7 +752,7 @@ _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
- if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
return;
}
@@ -799,7 +799,7 @@ _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
- if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
return;
}
@@ -846,7 +846,7 @@ _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
- if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv");
return;
}
@@ -872,7 +872,7 @@ _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
- if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
return;
}
@@ -900,7 +900,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 && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");
return;
}
@@ -981,7 +981,7 @@ _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
- if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");
return;
}
@@ -1010,7 +1010,7 @@ _mesa_ResetHistogram(GLenum target)
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
- if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
return;
}
@@ -1035,7 +1035,7 @@ _mesa_ResetMinmax(GLenum target)
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_histogram) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
return;
}