gallium: remove pipe parameter from pipe_texture_reference()

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

diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 129ce7a10c47d87d99f23ad78205d7010d2256d0..6a7f09489c5acca155979e0536a024bb453fbed9 100644 (file)
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -717,7 +717,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
    if (ctx->Pack.BufferObj->Name) {
       /* pack min/max values into a PBO */
       GLubyte *buf;
-      if (!_mesa_validate_pbo_access(&ctx->Pack, 2, 1, 1,
+      if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1,
                                      format, type, values)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetMinMax(invalid PBO access)");
@@ -748,8 +748,8 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
       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, (CONST GLfloat (*)[4]) minmax,
-                                 format, type, values, &ctx->Pack, 0);
+      _mesa_pack_rgba_span_float(ctx, 2, minmax,
+                                 format, type, values, &ctx->Pack, 0x0);
    }
 
    if (ctx->Pack.BufferObj->Name) {
@@ -801,7 +801,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
    if (ctx->Pack.BufferObj->Name) {
       /* pack min/max values into a PBO */
       GLubyte *buf;
-      if (!_mesa_validate_pbo_access(&ctx->Pack, ctx->Histogram.Width, 1, 1,
+      if (!_mesa_validate_pbo_access(1, &ctx->Pack, ctx->Histogram.Width, 1, 1,
                                      format, type, values)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetHistogram(invalid PBO access)");