mesa: Remove EXT_histogram.

This has always been optional, and not useful.

11 files changed, 10 insertions, 1124 deletions

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 753949be503..9a8917fc896 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -78,7 +78,6 @@ struct gl_enable_attrib
    GLboolean DepthTest;
    GLboolean Dither;
    GLboolean Fog;
-   GLboolean Histogram;
    GLboolean Light[MAX_LIGHTS];
    GLboolean Lighting;
    GLboolean LineSmooth;
@@ -107,7 +106,6 @@ struct gl_enable_attrib
    GLboolean Map2Vertex4;
    GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */
 
-   GLboolean MinMax;
    GLboolean Normalize;
    GLboolean PixelTexture;
    GLboolean PointSmooth;
@@ -279,8 +277,6 @@ _mesa_PushAttrib(GLbitfield mask)
       attr->Lighting = ctx->Light.Enabled;
       attr->LineSmooth = ctx->Line.SmoothFlag;
       attr->LineStipple = ctx->Line.StippleFlag;
-      attr->Histogram = ctx->Pixel.HistogramEnabled;
-      attr->MinMax = ctx->Pixel.MinMaxEnabled;
       attr->IndexLogicOp = ctx->Color.IndexLogicOpEnabled;
       attr->ColorLogicOp = ctx->Color.ColorLogicOpEnabled;
       attr->Map1Color4 = ctx->Eval.Map1Color4;
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 3bddf2570ec..6f2ffe107d2 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -98,7 +98,6 @@
 #include "feedback.h"
 #include "fog.h"
 #include "framebuffer.h"
-#include "histogram.h"
 #include "hint.h"
 #include "hash.h"
 #include "light.h"
@@ -738,7 +737,6 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_fbobjects( ctx );
    _mesa_init_feedback( ctx );
    _mesa_init_fog( ctx );
-   _mesa_init_histogram( ctx );
    _mesa_init_hint( ctx );
    _mesa_init_line( ctx );
    _mesa_init_lighting( ctx );
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index db30123c0fb..b0eb294df47 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -363,13 +363,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          FLUSH_VERTICES(ctx, _NEW_FOG);
          ctx->Fog.Enabled = state;
          break;
-      case GL_HISTOGRAM:
-         CHECK_EXTENSION(EXT_histogram, cap);
-         if (ctx->Pixel.HistogramEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.HistogramEnabled = state;
-         break;
       case GL_LIGHT0:
       case GL_LIGHT1:
       case GL_LIGHT2:
@@ -534,12 +527,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          FLUSH_VERTICES(ctx, _NEW_EVAL);
          ctx->Eval.Map2Vertex4 = state;
          break;
-      case GL_MINMAX:
-         if (ctx->Pixel.MinMaxEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.MinMaxEnabled = state;
-         break;
       case GL_NORMALIZE:
          if (ctx->Transform.Normalize == state)
             return;
@@ -1356,14 +1343,6 @@ _mesa_IsEnabled( GLenum cap )
          return (ctx->Array.ArrayObj->PointSize.Enabled != 0);
 #endif
 
-      /* GL_EXT_histogram */
-      case GL_HISTOGRAM:
-         CHECK_EXTENSION(EXT_histogram);
-         return ctx->Pixel.HistogramEnabled;
-      case GL_MINMAX:
-         CHECK_EXTENSION(EXT_histogram);
-         return ctx->Pixel.MinMaxEnabled;
-
       /* GL_SGI_color_table */
       case GL_COLOR_TABLE_SGI:
          CHECK_EXTENSION(SGI_color_table);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index b6500b9c4e6..33599136b41 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -128,7 +128,6 @@ static const struct {
    { OFF, "GL_EXT_framebuffer_sRGB",           F(EXT_framebuffer_sRGB) },
    { OFF, "GL_EXT_fog_coord",                  F(EXT_fog_coord) },
    { OFF, "GL_EXT_gpu_program_parameters",     F(EXT_gpu_program_parameters) },
-   { OFF, "GL_EXT_histogram",                  F(EXT_histogram) },
    { ON,  "GL_EXT_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_EXT_packed_depth_stencil",       F(EXT_packed_depth_stencil) },
    { OFF, "GL_EXT_packed_float",               F(EXT_packed_float) },
@@ -319,7 +318,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #if FEATURE_ARB_framebuffer_object
    ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
 #endif
-   ctx->Extensions.EXT_histogram = GL_TRUE;
    /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
    ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
    ctx->Extensions.EXT_paletted_texture = GL_TRUE;
@@ -400,7 +398,6 @@ _mesa_enable_imaging_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_blend_minmax = GL_TRUE;
    ctx->Extensions.EXT_blend_subtract = GL_TRUE;
    ctx->Extensions.EXT_convolution = GL_TRUE;
-   ctx->Extensions.EXT_histogram = GL_TRUE;
    ctx->Extensions.SGI_color_matrix = GL_TRUE;
    ctx->Extensions.SGI_color_table = GL_TRUE;
 }
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index a840663f6af..f04f42022d6 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -277,7 +277,6 @@ EXTRA_EXT(NV_texture_rectangle);
 EXTRA_EXT(EXT_stencil_two_side);
 EXTRA_EXT(NV_light_max_exponent);
 EXTRA_EXT(EXT_convolution);
-EXTRA_EXT(EXT_histogram);
 EXTRA_EXT(SGI_color_table);
 EXTRA_EXT(SGI_texture_color_table);
 EXTRA_EXT(EXT_depth_bounds_test);
@@ -938,11 +937,6 @@ static const struct value_desc values[] = {
      CONTEXT_FLOAT(Pixel.PostConvolutionBias[3]),
      extra_EXT_convolution },
 
-   /* GL_EXT_histogram */
-   { GL_HISTOGRAM, CONTEXT_BOOL(Pixel.HistogramEnabled),
-     extra_EXT_histogram },
-   { GL_MINMAX, CONTEXT_BOOL(Pixel.MinMaxEnabled), extra_EXT_histogram },
-
    /* GL_SGI_color_table */
    { GL_COLOR_TABLE_SGI,
      CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]),
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index db3cbfc5a90..a14d93e5199 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -35,585 +35,6 @@
 
 #if FEATURE_histogram
 
-
-/*
- * XXX the packed pixel formats haven't been tested.
- */
-static void
-pack_histogram( GLcontext *ctx,
-                GLuint n, CONST GLuint rgba[][4],
-                GLenum format, GLenum type, GLvoid *destination,
-                const struct gl_pixelstore_attrib *packing )
-{
-   const GLint comps = _mesa_components_in_format(format);
-   GLuint luminance[MAX_WIDTH];
-
-   if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         luminance[i] = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
-      }
-   }
-
-#define PACK_MACRO(TYPE)					\
-   {								\
-      GLuint i;							\
-      switch (format) {						\
-         case GL_RED:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][RCOMP];			\
-            break;						\
-         case GL_GREEN:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][GCOMP];			\
-            break;						\
-         case GL_BLUE:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][BCOMP];			\
-            break;						\
-         case GL_ALPHA:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][ACOMP];			\
-            break;						\
-         case GL_LUMINANCE:					\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) luminance[i];			\
-            break;						\
-         case GL_LUMINANCE_ALPHA:				\
-            for (i=0;i<n;i++) {					\
-               dst[i*2+0] = (TYPE) luminance[i];		\
-               dst[i*2+1] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_RGB:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*3+0] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*3+2] = (TYPE) rgba[i][BCOMP];		\
-            }							\
-            break;						\
-         case GL_RGBA:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_BGR:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*3+0] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*3+2] = (TYPE) rgba[i][RCOMP];		\
-            }							\
-            break;						\
-         case GL_BGRA:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_ABGR_EXT:					\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][ACOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][RCOMP];		\
-            }							\
-            break;						\
-         default:						\
-            _mesa_problem(ctx, "bad format in pack_histogram");	\
-      }								\
-   }
-
-   switch (type) {
-      case GL_UNSIGNED_BYTE:
-         {
-            GLubyte *dst = (GLubyte *) destination;
-            PACK_MACRO(GLubyte);
-         }
-         break;
-      case GL_BYTE:
-         {
-            GLbyte *dst = (GLbyte *) destination;
-            PACK_MACRO(GLbyte);
-         }
-         break;
-      case GL_UNSIGNED_SHORT:
-         {
-            GLushort *dst = (GLushort *) destination;
-            PACK_MACRO(GLushort);
-            if (packing->SwapBytes) {
-               _mesa_swap2(dst, n * comps);
-            }
-         }
-         break;
-      case GL_SHORT:
-         {
-            GLshort *dst = (GLshort *) destination;
-            PACK_MACRO(GLshort);
-            if (packing->SwapBytes) {
-               _mesa_swap2((GLushort *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT:
-         {
-            GLuint *dst = (GLuint *) destination;
-            PACK_MACRO(GLuint);
-            if (packing->SwapBytes) {
-               _mesa_swap4(dst, n * comps);
-            }
-         }
-         break;
-      case GL_INT:
-         {
-            GLint *dst = (GLint *) destination;
-            PACK_MACRO(GLint);
-            if (packing->SwapBytes) {
-               _mesa_swap4((GLuint *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_FLOAT:
-         {
-            GLfloat *dst = (GLfloat *) destination;
-            PACK_MACRO(GLfloat);
-            if (packing->SwapBytes) {
-               _mesa_swap4((GLuint *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_HALF_FLOAT_ARB:
-         {
-            /* temporarily store as GLuints */
-            GLuint temp[4*HISTOGRAM_TABLE_SIZE];
-            GLuint *dst = temp;
-            GLhalfARB *half = (GLhalfARB *) destination;
-            GLuint i;
-            /* get GLuint values */
-            PACK_MACRO(GLuint);
-            /* convert to GLhalf */
-            for (i = 0; i < n * comps; i++) {
-               half[i] = _mesa_float_to_half((GLfloat) temp[i]);
-            }
-            if (packing->SwapBytes) {
-               _mesa_swap2((GLushort *) half, n * comps);
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-         if (format == GL_RGB) {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x7) << 5)
-                      | ((rgba[i][GCOMP] & 0x7) << 2)
-                      | ((rgba[i][BCOMP] & 0x3)     );
-            }
-         }
-         else {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x7) << 5)
-                      | ((rgba[i][GCOMP] & 0x7) << 2)
-                      | ((rgba[i][RCOMP] & 0x3)     );
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-         if (format == GL_RGB) {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3) << 6)
-                      | ((rgba[i][GCOMP] & 0x7) << 3)
-                      | ((rgba[i][BCOMP] & 0x7)     );
-            }
-         }
-         else {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x3) << 6)
-                      | ((rgba[i][GCOMP] & 0x7) << 3)
-                      | ((rgba[i][RCOMP] & 0x7)     );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-         if (format == GL_RGB) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][BCOMP] & 0x1f)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][RCOMP] & 0x1f)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         if (format == GL_RGB) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][RCOMP] & 0x1f)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][BCOMP] & 0x1f)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][BCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][RCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][BCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][RCOMP] & 0xf)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][BCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][RCOMP] & 0xf)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][RCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][BCOMP] & 0xf)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][BCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][RCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][RCOMP] & 0x1)       );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][RCOMP] & 0x1)       );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][RCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][BCOMP] & 0x1)       );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][BCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][RCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][BCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][RCOMP] & 0xff)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][BCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][RCOMP] & 0xff)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][RCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][BCOMP] & 0xff)      );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][BCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_10_10_10_2:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][BCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][RCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][BCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][RCOMP] & 0x3)        );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][BCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][RCOMP] & 0x3)        );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][RCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][BCOMP] & 0x3)        );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][BCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         break;
-      default:
-         _mesa_problem(ctx, "Bad type in pack_histogram");
-   }
-
-#undef PACK_MACRO
-}
-
-
-/*
- * Given an internalFormat token passed to glHistogram or glMinMax,
- * return the corresponding base format.
- * Return -1 if invalid token.
- */
-static GLint
-base_histogram_format( GLenum format )
-{
-   switch (format) {
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-         return GL_ALPHA;
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-         return GL_LUMINANCE;
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE4_ALPHA4:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-         return GL_LUMINANCE_ALPHA;
-      case GL_RGB:
-      case GL_R3_G3_B2:
-      case GL_RGB4:
-      case GL_RGB5:
-      case GL_RGB8:
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-         return GL_RGB;
-      case GL_RGBA:
-      case GL_RGBA2:
-      case GL_RGBA4:
-      case GL_RGB5_A1:
-      case GL_RGBA8:
-      case GL_RGB10_A2:
-      case GL_RGBA12:
-      case GL_RGBA16:
-         return GL_RGBA;
-      default:
-         return -1;  /* error */
-   }
-}
-
-
-
 /**********************************************************************
  * API functions
  */
@@ -627,62 +48,8 @@ static void GLAPIENTRY
 _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
-      return;
-   }
-
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmax(target)");
-      return;
-   }
-
-   if (format != GL_RED &&
-       format != GL_GREEN &&
-       format != GL_BLUE &&
-       format != GL_ALPHA &&
-       format != GL_RGB &&
-       format != GL_BGR &&
-       format != GL_RGBA &&
-       format != GL_BGRA &&
-       format != GL_ABGR_EXT &&
-       format != GL_LUMINANCE &&
-       format != GL_LUMINANCE_ALPHA) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMax(format)");
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax(format or type)");
-      return;
-   }
-
 
-   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack, 2, 1, 1,
-                                        format, type, values, "glGetMinmax");
-   if (!values)
-      return;
-
-   {
-      GLfloat minmax[2][4];
-      minmax[0][RCOMP] = CLAMP(ctx->MinMax.Min[RCOMP], 0.0F, 1.0F);
-      minmax[0][GCOMP] = CLAMP(ctx->MinMax.Min[GCOMP], 0.0F, 1.0F);
-      minmax[0][BCOMP] = CLAMP(ctx->MinMax.Min[BCOMP], 0.0F, 1.0F);
-      minmax[0][ACOMP] = CLAMP(ctx->MinMax.Min[ACOMP], 0.0F, 1.0F);
-      minmax[1][RCOMP] = CLAMP(ctx->MinMax.Max[RCOMP], 0.0F, 1.0F);
-      minmax[1][GCOMP] = CLAMP(ctx->MinMax.Max[GCOMP], 0.0F, 1.0F);
-      minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F);
-      minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F);
-      _mesa_pack_rgba_span_float(ctx, 2, minmax,
-                                 format, type, values, &ctx->Pack, 0x0);
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-
-   if (reset) {
-      _mesa_ResetMinmax(GL_MINMAX);
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
 }
 
 
@@ -690,59 +57,8 @@ static void GLAPIENTRY
 _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(target)");
-      return;
-   }
-
-   if (format != GL_RED &&
-       format != GL_GREEN &&
-       format != GL_BLUE &&
-       format != GL_ALPHA &&
-       format != GL_RGB &&
-       format != GL_BGR &&
-       format != GL_RGBA &&
-       format != GL_BGRA &&
-       format != GL_ABGR_EXT &&
-       format != GL_LUMINANCE &&
-       format != GL_LUMINANCE_ALPHA) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(format)");
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram(format or type)");
-      return;
-   }
 
-   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
-                                        ctx->Histogram.Width, 1, 1,
-                                        format, type, values,
-                                        "glGetHistogram");
-   if (!values)
-      return;
-
-   pack_histogram(ctx, ctx->Histogram.Width,
-                  (CONST GLuint (*)[4]) ctx->Histogram.Count,
-                  format, type, values, &ctx->Pack);
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-
-   if (reset) {
-      GLuint i;
-      for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-         ctx->Histogram.Count[i][0] = 0;
-         ctx->Histogram.Count[i][1] = 0;
-         ctx->Histogram.Count[i][2] = 0;
-         ctx->Histogram.Count[i][3] = 0;
-      }
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
 }
 
 
@@ -750,46 +66,8 @@ static void GLAPIENTRY
 _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
-      return;
-   }
 
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(target)");
-      return;
-   }
-
-   switch (pname) {
-      case GL_HISTOGRAM_WIDTH:
-         *params = (GLfloat) ctx->Histogram.Width;
-         break;
-      case GL_HISTOGRAM_FORMAT:
-         *params = (GLfloat) ctx->Histogram.Format;
-         break;
-      case GL_HISTOGRAM_RED_SIZE:
-         *params = (GLfloat) ctx->Histogram.RedSize;
-         break;
-      case GL_HISTOGRAM_GREEN_SIZE:
-         *params = (GLfloat) ctx->Histogram.GreenSize;
-         break;
-      case GL_HISTOGRAM_BLUE_SIZE:
-         *params = (GLfloat) ctx->Histogram.BlueSize;
-         break;
-      case GL_HISTOGRAM_ALPHA_SIZE:
-         *params = (GLfloat) ctx->Histogram.AlphaSize;
-         break;
-      case GL_HISTOGRAM_LUMINANCE_SIZE:
-         *params = (GLfloat) ctx->Histogram.LuminanceSize;
-         break;
-      case GL_HISTOGRAM_SINK:
-         *params = (GLfloat) ctx->Histogram.Sink;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(pname)");
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
 }
 
 
@@ -797,46 +75,8 @@ static void GLAPIENTRY
 _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
-      return;
-   }
 
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(target)");
-      return;
-   }
-
-   switch (pname) {
-      case GL_HISTOGRAM_WIDTH:
-         *params = (GLint) ctx->Histogram.Width;
-         break;
-      case GL_HISTOGRAM_FORMAT:
-         *params = (GLint) ctx->Histogram.Format;
-         break;
-      case GL_HISTOGRAM_RED_SIZE:
-         *params = (GLint) ctx->Histogram.RedSize;
-         break;
-      case GL_HISTOGRAM_GREEN_SIZE:
-         *params = (GLint) ctx->Histogram.GreenSize;
-         break;
-      case GL_HISTOGRAM_BLUE_SIZE:
-         *params = (GLint) ctx->Histogram.BlueSize;
-         break;
-      case GL_HISTOGRAM_ALPHA_SIZE:
-         *params = (GLint) ctx->Histogram.AlphaSize;
-         break;
-      case GL_HISTOGRAM_LUMINANCE_SIZE:
-         *params = (GLint) ctx->Histogram.LuminanceSize;
-         break;
-      case GL_HISTOGRAM_SINK:
-         *params = (GLint) ctx->Histogram.Sink;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(pname)");
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
 }
 
 
@@ -844,25 +84,8 @@ static void GLAPIENTRY
 _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv");
-      return;
-   }
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameterfv(target)");
-      return;
-   }
-   if (pname == GL_MINMAX_FORMAT) {
-      *params = (GLfloat) ctx->MinMax.Format;
-   }
-   else if (pname == GL_MINMAX_SINK) {
-      *params = (GLfloat) ctx->MinMax.Sink;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameterfv(pname)");
-   }
 }
 
 
@@ -870,108 +93,17 @@ static void GLAPIENTRY
 _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
-      return;
-   }
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameteriv(target)");
-      return;
-   }
-   if (pname == GL_MINMAX_FORMAT) {
-      *params = (GLint) ctx->MinMax.Format;
-   }
-   else if (pname == GL_MINMAX_SINK) {
-      *params = (GLint) ctx->MinMax.Sink;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameteriv(pname)");
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
 }
 
 
 static void GLAPIENTRY
 _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
 {
-   GLuint i;
-   GLboolean error = GL_FALSE;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
-
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");
-      return;
-   }
 
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(target)");
-      return;
-   }
-
-   if (width < 0 || width > HISTOGRAM_TABLE_SIZE) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         if (width < 0)
-            _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
-         else
-            _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glHistogram(width)");
-         return;
-      }
-   }
-
-   if (width != 0 && !_mesa_is_pow_two(width)) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
-         return;
-      }
-   }
-
-   if (base_histogram_format(internalFormat) < 0) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(internalFormat)");
-         return;
-      }
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-
-   /* reset histograms */
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
-
-   if (error) {
-      ctx->Histogram.Width = 0;
-      ctx->Histogram.Format = 0;
-      ctx->Histogram.RedSize       = 0;
-      ctx->Histogram.GreenSize     = 0;
-      ctx->Histogram.BlueSize      = 0;
-      ctx->Histogram.AlphaSize     = 0;
-      ctx->Histogram.LuminanceSize = 0;
-   }
-   else {
-      ctx->Histogram.Width = width;
-      ctx->Histogram.Format = internalFormat;
-      ctx->Histogram.Sink = sink;
-      ctx->Histogram.RedSize       = 8 * sizeof(GLuint);
-      ctx->Histogram.GreenSize     = 8 * sizeof(GLuint);
-      ctx->Histogram.BlueSize      = 8 * sizeof(GLuint);
-      ctx->Histogram.AlphaSize     = 8 * sizeof(GLuint);
-      ctx->Histogram.LuminanceSize = 8 * sizeof(GLuint);
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");
 }
 
 
@@ -979,53 +111,17 @@ static void GLAPIENTRY
 _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");
-      return;
-   }
 
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(target)");
-      return;
-   }
-
-   if (base_histogram_format(internalFormat) < 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(internalFormat)");
-      return;
-   }
-
-   if (ctx->MinMax.Sink == sink)
-      return;
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-   ctx->MinMax.Sink = sink;
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");
 }
 
 
 static void GLAPIENTRY
 _mesa_ResetHistogram(GLenum target)
 {
-   GLuint i;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
-
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glResetHistogram(target)");
-      return;
-   }
 
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
 }
 
 
@@ -1033,22 +129,8 @@ static void GLAPIENTRY
 _mesa_ResetMinmax(GLenum target)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (!ctx->Extensions.EXT_histogram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
-      return;
-   }
-
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glResetMinMax(target)");
-      return;
-   }
-
-   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
-   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
-   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
-   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
 }
 
 
@@ -1067,39 +149,4 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp)
    SET_ResetMinmax(disp, _mesa_ResetMinmax);
 }
 
-
 #endif /* FEATURE_histogram */
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-void _mesa_init_histogram( GLcontext * ctx )
-{
-   int i;
-
-   /* Histogram group */
-   ctx->Histogram.Width = 0;
-   ctx->Histogram.Format = GL_RGBA;
-   ctx->Histogram.Sink = GL_FALSE;
-   ctx->Histogram.RedSize       = 0;
-   ctx->Histogram.GreenSize     = 0;
-   ctx->Histogram.BlueSize      = 0;
-   ctx->Histogram.AlphaSize     = 0;
-   ctx->Histogram.LuminanceSize = 0;
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
-
-   /* Min/Max group */
-   ctx->MinMax.Format = GL_RGBA;
-   ctx->MinMax.Sink = GL_FALSE;
-   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
-   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
-   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
-   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
-}
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index dbae1bbd06b..240087141b3 100644
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -52,6 +52,4 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp)
 
 #endif /* FEATURE_histogram */
 
-extern void _mesa_init_histogram( GLcontext * ctx );
-
 #endif /* HISTOGRAM_H */
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 86aa6d0d702..453611d00b6 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1876,69 +1876,6 @@ _mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
    }
 }
 
-
-
-/*
- * Update the min/max values from an array of fragment colors.
- */
-static void
-update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      /* update mins */
-      if (rgba[i][RCOMP] < ctx->MinMax.Min[RCOMP])
-         ctx->MinMax.Min[RCOMP] = rgba[i][RCOMP];
-      if (rgba[i][GCOMP] < ctx->MinMax.Min[GCOMP])
-         ctx->MinMax.Min[GCOMP] = rgba[i][GCOMP];
-      if (rgba[i][BCOMP] < ctx->MinMax.Min[BCOMP])
-         ctx->MinMax.Min[BCOMP] = rgba[i][BCOMP];
-      if (rgba[i][ACOMP] < ctx->MinMax.Min[ACOMP])
-         ctx->MinMax.Min[ACOMP] = rgba[i][ACOMP];
-
-      /* update maxs */
-      if (rgba[i][RCOMP] > ctx->MinMax.Max[RCOMP])
-         ctx->MinMax.Max[RCOMP] = rgba[i][RCOMP];
-      if (rgba[i][GCOMP] > ctx->MinMax.Max[GCOMP])
-         ctx->MinMax.Max[GCOMP] = rgba[i][GCOMP];
-      if (rgba[i][BCOMP] > ctx->MinMax.Max[BCOMP])
-         ctx->MinMax.Max[BCOMP] = rgba[i][BCOMP];
-      if (rgba[i][ACOMP] > ctx->MinMax.Max[ACOMP])
-         ctx->MinMax.Max[ACOMP] = rgba[i][ACOMP];
-   }
-}
-
-
-/*
- * Update the histogram values from an array of fragment colors.
- */
-static void
-update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
-{
-   const GLint max = ctx->Histogram.Width - 1;
-   GLfloat w = (GLfloat) max;
-   GLuint i;
-
-   if (ctx->Histogram.Width == 0)
-      return;
-
-   for (i = 0; i < n; i++) {
-      GLint ri = IROUND(rgba[i][RCOMP] * w);
-      GLint gi = IROUND(rgba[i][GCOMP] * w);
-      GLint bi = IROUND(rgba[i][BCOMP] * w);
-      GLint ai = IROUND(rgba[i][ACOMP] * w);
-      ri = CLAMP(ri, 0, max);
-      gi = CLAMP(gi, 0, max);
-      bi = CLAMP(bi, 0, max);
-      ai = CLAMP(ai, 0, max);
-      ctx->Histogram.Count[ri][RCOMP]++;
-      ctx->Histogram.Count[gi][GCOMP]++;
-      ctx->Histogram.Count[bi][BCOMP]++;
-      ctx->Histogram.Count[ai][ACOMP]++;
-   }
-}
-
-
 /**
  * Apply various pixel transfer operations to an array of RGBA pixels
  * as indicated by the transferOps bitmask
@@ -1992,14 +1929,6 @@ _mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
    if (transferOps & IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT) {
       _mesa_lookup_rgba_float(&ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX], n, rgba);
    }
-   /* update histogram count */
-   if (transferOps & IMAGE_HISTOGRAM_BIT) {
-      update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
-   }
-   /* update min/max values */
-   if (transferOps & IMAGE_MIN_MAX_BIT) {
-      update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
-   }
    /* clamping to [0,1] */
    if (transferOps & IMAGE_CLAMP_BIT) {
       GLuint i;
@@ -2132,9 +2061,6 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
 
    if (transferOps) {
       _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);
-      if ((transferOps & IMAGE_MIN_MAX_BIT) && ctx->MinMax.Sink) {
-         return;
-      }
    }
 
    if (dstFormat == GL_LUMINANCE || dstFormat == GL_LUMINANCE_ALPHA) {
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 92311ef7f0a..9b9b6d0420b 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -100,7 +100,6 @@
 #define FEATURE_drawpix                   FEATURE_GL
 #define FEATURE_evaluators                FEATURE_GL
 #define FEATURE_feedback                  FEATURE_GL
-#define FEATURE_histogram                 FEATURE_GL
 #define FEATURE_pixel_transfer            FEATURE_GL
 #define FEATURE_queryobj                  FEATURE_GL
 #define FEATURE_rastpos                   FEATURE_GL
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0bb8734e4bf..d918482353f 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -812,34 +812,6 @@ struct gl_hint_attrib
 
 
 /**
- * Histogram attributes.
- */
-struct gl_histogram_attrib
-{
-   GLuint Width;                            /**< number of table entries */
-   GLint Format;                            /**< GL_ALPHA, GL_RGB, etc */
-   GLuint Count[HISTOGRAM_TABLE_SIZE][4];   /**< the histogram */
-   GLboolean Sink;                          /**< terminate image transfer? */
-   GLubyte RedSize;                         /**< Bits per counter */
-   GLubyte GreenSize;
-   GLubyte BlueSize;
-   GLubyte AlphaSize;
-   GLubyte LuminanceSize;
-};
-
-
-/**
- * Color Min/max state.
- */
-struct gl_minmax_attrib
-{
-   GLenum Format;
-   GLboolean Sink;
-   GLfloat Min[4], Max[4];   /**< RGBA */
-};
-
-
-/**
  * Image convolution state.
  */
 struct gl_convolution_attrib
@@ -1013,11 +985,6 @@ struct gl_pixel_attrib
    GLfloat PostColorMatrixScale[4];  /**< RGBA */
    GLfloat PostColorMatrixBias[4];   /**< RGBA */
 
-   /* Histogram & minmax (GL_EXT_histogram) */
-   /* Note: histogram and minmax data are not part of this attrib group */
-   GLboolean HistogramEnabled;
-   GLboolean MinMaxEnabled;
-
    /*--- End Pixel Transfer State ---*/
 
    /** glPixelZoom */
@@ -2717,7 +2684,6 @@ struct gl_extensions
    GLboolean EXT_framebuffer_object;
    GLboolean EXT_framebuffer_sRGB;
    GLboolean EXT_gpu_program_parameters;
-   GLboolean EXT_histogram;
    GLboolean EXT_multi_draw_arrays;
    GLboolean EXT_paletted_texture;
    GLboolean EXT_packed_depth_stencil;
@@ -2831,8 +2797,6 @@ struct gl_matrix_stack
 #define IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT    0x40
 #define IMAGE_COLOR_MATRIX_BIT                    0x80
 #define IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT   0x100
-#define IMAGE_HISTOGRAM_BIT                       0x200
-#define IMAGE_MIN_MAX_BIT                         0x400
 #define IMAGE_CLAMP_BIT                           0x800
 
 
@@ -2846,9 +2810,7 @@ struct gl_matrix_stack
 #define IMAGE_POST_CONVOLUTION_BITS (IMAGE_POST_CONVOLUTION_SCALE_BIAS |      \
                                      IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT | \
                                      IMAGE_COLOR_MATRIX_BIT |                 \
-                                     IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT |\
-                                     IMAGE_HISTOGRAM_BIT |                    \
-                                     IMAGE_MIN_MAX_BIT)
+                                     IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT)
 /*@}*/
 
 
@@ -3206,8 +3168,6 @@ struct __GLcontextRec
    /** \name Other assorted state (not pushed/popped on attribute stack) */
    /*@{*/
    struct gl_pixelmaps          PixelMaps;
-   struct gl_histogram_attrib	Histogram;
-   struct gl_minmax_attrib	MinMax;
    struct gl_convolution_attrib Convolution1D;
    struct gl_convolution_attrib Convolution2D;
    struct gl_convolution_attrib Separable2D;
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 675e933ca62..980c40550c3 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -738,12 +738,6 @@ update_image_transfer_state(GLcontext *ctx)
    if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX])
       mask |= IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT;
 
-   if (ctx->Pixel.HistogramEnabled)
-      mask |= IMAGE_HISTOGRAM_BIT;
-
-   if (ctx->Pixel.MinMaxEnabled)
-      mask |= IMAGE_MIN_MAX_BIT;
-
    ctx->_ImageTransferState = mask;
 }
 
@@ -829,8 +823,6 @@ _mesa_init_pixel( GLcontext *ctx )
    init_pixelmap(&ctx->PixelMaps.GtoG);
    init_pixelmap(&ctx->PixelMaps.BtoB);
    init_pixelmap(&ctx->PixelMaps.AtoA);
-   ctx->Pixel.HistogramEnabled = GL_FALSE;
-   ctx->Pixel.MinMaxEnabled = GL_FALSE;
    ASSIGN_4V(ctx->Pixel.PostColorMatrixScale, 1.0, 1.0, 1.0, 1.0);
    ASSIGN_4V(ctx->Pixel.PostColorMatrixBias, 0.0, 0.0, 0.0, 0.0);
    for (i = 0; i < COLORTABLE_MAX; i++) {