X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fhistogram.c;h=5fee4fd0e34520219d6989b5d9daf1fc07a87b33;hb=0491142152dcc61ebe0b46b05c94957e54c44bd9;hp=06798e37751e3f516f748088b4a9a08e3f01a770;hpb=90f042ae8dbc00ecedab5cc68dbc6abae4228af5;p=mesa.git diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c index 06798e37751..5fee4fd0e34 100644 --- a/src/mesa/main/histogram.c +++ b/src/mesa/main/histogram.c @@ -1,10 +1,8 @@ -/* $Id: histogram.c,v 1.3 2000/12/10 19:23:19 brianp Exp $ */ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 6.3 * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -25,20 +23,17 @@ */ -#ifdef PC_HEADER -#include "all.h" -#else #include "glheader.h" +#include "bufferobj.h" #include "colormac.h" #include "context.h" #include "image.h" #include "histogram.h" -#include "mmath.h" -#endif + /* - * XXX need to handle packed datatypes! + * XXX the packed pixel formats haven't been tested. */ static void pack_histogram( GLcontext *ctx, @@ -125,7 +120,7 @@ pack_histogram( GLcontext *ctx, } \ break; \ default: \ - gl_problem(ctx, "bad format in pack_histogram"); \ + _mesa_problem(ctx, "bad format in pack_histogram"); \ } \ } @@ -187,164 +182,373 @@ pack_histogram( GLcontext *ctx, } } break; - default: - gl_problem(ctx, "Bad type in pack_histogram"); - } - -#undef PACK_MACRO -} - - - -/* - * XXX need to handle packed datatypes! - */ -static void -pack_minmax( GLcontext *ctx, CONST GLfloat minmax[2][4], - GLenum format, GLenum type, GLvoid *destination, - const struct gl_pixelstore_attrib *packing ) -{ - const GLint comps = _mesa_components_in_format(format); - GLuint luminance[2]; - - if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) { - luminance[0] = minmax[0][RCOMP] + minmax[0][GCOMP] + minmax[0][BCOMP]; - luminance[1] = minmax[1][RCOMP] + minmax[1][GCOMP] + minmax[1][BCOMP]; - } - -#define PACK_MACRO(TYPE, CONVERSION) \ - { \ - GLuint i; \ - switch (format) { \ - case GL_RED: \ - for (i=0;i<2;i++) \ - dst[i] = CONVERSION (minmax[i][RCOMP]); \ - break; \ - case GL_GREEN: \ - for (i=0;i<2;i++) \ - dst[i] = CONVERSION (minmax[i][GCOMP]); \ - break; \ - case GL_BLUE: \ - for (i=0;i<2;i++) \ - dst[i] = CONVERSION (minmax[i][BCOMP]); \ - break; \ - case GL_ALPHA: \ - for (i=0;i<2;i++) \ - dst[i] = CONVERSION (minmax[i][ACOMP]); \ - break; \ - case GL_LUMINANCE: \ - for (i=0;i<2;i++) \ - dst[i] = CONVERSION (luminance[i]); \ - break; \ - case GL_LUMINANCE_ALPHA: \ - for (i=0;i<2;i++) { \ - dst[i*2+0] = CONVERSION (luminance[i]); \ - dst[i*2+1] = CONVERSION (minmax[i][ACOMP]); \ - } \ - break; \ - case GL_RGB: \ - for (i=0;i<2;i++) { \ - dst[i*3+0] = CONVERSION (minmax[i][RCOMP]); \ - dst[i*3+1] = CONVERSION (minmax[i][GCOMP]); \ - dst[i*3+2] = CONVERSION (minmax[i][BCOMP]); \ - } \ - break; \ - case GL_RGBA: \ - for (i=0;i<2;i++) { \ - dst[i*4+0] = CONVERSION (minmax[i][RCOMP]); \ - dst[i*4+1] = CONVERSION (minmax[i][GCOMP]); \ - dst[i*4+2] = CONVERSION (minmax[i][BCOMP]); \ - dst[i*4+3] = CONVERSION (minmax[i][ACOMP]); \ - } \ - break; \ - case GL_BGR: \ - for (i=0;i<2;i++) { \ - dst[i*3+0] = CONVERSION (minmax[i][BCOMP]); \ - dst[i*3+1] = CONVERSION (minmax[i][GCOMP]); \ - dst[i*3+2] = CONVERSION (minmax[i][RCOMP]); \ - } \ - break; \ - case GL_BGRA: \ - for (i=0;i<2;i++) { \ - dst[i*4+0] = CONVERSION (minmax[i][BCOMP]); \ - dst[i*4+1] = CONVERSION (minmax[i][GCOMP]); \ - dst[i*4+2] = CONVERSION (minmax[i][RCOMP]); \ - dst[i*4+3] = CONVERSION (minmax[i][ACOMP]); \ - } \ - break; \ - case GL_ABGR_EXT: \ - for (i=0;i<2;i++) { \ - dst[i*4+0] = CONVERSION (minmax[i][ACOMP]); \ - dst[i*4+1] = CONVERSION (minmax[i][BCOMP]); \ - dst[i*4+2] = CONVERSION (minmax[i][GCOMP]); \ - dst[i*4+3] = CONVERSION (minmax[i][RCOMP]); \ - } \ - break; \ - default: \ - gl_problem(ctx, "bad format in pack_minmax"); \ - } \ - } - - switch (type) { - case GL_UNSIGNED_BYTE: + case GL_HALF_FLOAT_ARB: { + /* temporarily store as GLuints */ + GLuint temp[4*HISTOGRAM_TABLE_SIZE]; + GLhalfARB *dst = (GLhalfARB *) destination; + GLuint i; + /* get GLuint values */ + PACK_MACRO(GLuint); + /* convert to GLhalf */ + for (i = 0; i < n * comps; i++) { + dst[i] = _mesa_float_to_half((GLfloat) temp[i]); + } + if (packing->SwapBytes) { + _mesa_swap2((GLushort *) dst, n * comps); + } + } + break; + case GL_UNSIGNED_BYTE_3_3_2: + if (format == GL_RGB) { GLubyte *dst = (GLubyte *) destination; - PACK_MACRO(GLubyte, FLOAT_TO_UBYTE); + 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_BYTE: - { - GLbyte *dst = (GLbyte *) destination; - PACK_MACRO(GLbyte, FLOAT_TO_BYTE); + 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: - { + case GL_UNSIGNED_SHORT_5_6_5: + if (format == GL_RGB) { GLushort *dst = (GLushort *) destination; - PACK_MACRO(GLushort, FLOAT_TO_USHORT); - if (packing->SwapBytes) { - _mesa_swap2(dst, 2 * comps); + 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_SHORT: - { - GLshort *dst = (GLshort *) destination; - PACK_MACRO(GLshort, FLOAT_TO_SHORT); - if (packing->SwapBytes) { - _mesa_swap2((GLushort *) dst, 2 * comps); + 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_INT: - { + 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; - PACK_MACRO(GLuint, FLOAT_TO_UINT); - if (packing->SwapBytes) { - _mesa_swap4(dst, 2 * comps); + 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_INT: - { - GLint *dst = (GLint *) destination; - PACK_MACRO(GLint, FLOAT_TO_INT); - if (packing->SwapBytes) { - _mesa_swap4((GLuint *) dst, 2 * comps); + 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_FLOAT: - { - GLfloat *dst = (GLfloat *) destination; - PACK_MACRO(GLfloat, (GLfloat)); - if (packing->SwapBytes) { - _mesa_swap4((GLuint *) dst, 2 * comps); + 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: - gl_problem(ctx, "Bad type in pack_minmax"); + _mesa_problem(ctx, "Bad type in pack_histogram"); } #undef PACK_MACRO @@ -404,29 +608,70 @@ base_histogram_format( GLenum format ) } -void + +/********************************************************************** + * API functions + */ + + +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, "glGetMinmax"); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glGetMinmax"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax"); return; } if (target != GL_MINMAX) { - gl_error(ctx, GL_INVALID_ENUM, "glGetMinmax(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmax(target)"); return; } - if (!_mesa_is_legal_format_and_type(format, type)) { - gl_error(ctx, GL_INVALID_OPERATION, "glGetMinmax(format or type)"); + 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; } - if (!values) + if (ctx->Pack.BufferObj->Name) { + /* pack min/max values into a PBO */ + GLubyte *buf; + if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1, + format, type, values)) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glGetMinMax(invalid PBO access)"); + return; + } + buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, + GL_WRITE_ONLY_ARB, + ctx->Pack.BufferObj); + if (!buf) { + /* buffer is already mapped - that's an error */ + _mesa_error(ctx, GL_INVALID_OPERATION,"glGetMinMax(PBO is mapped)"); + return; + } + values = ADD_POINTERS(buf, values); + } + else if (!values) { + /* not an error */ return; + } { GLfloat minmax[2][4]; @@ -438,8 +683,13 @@ _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); - pack_minmax(ctx, (CONST GLfloat (*)[4]) minmax, - format, type, values, &ctx->Pack); + _mesa_pack_rgba_span_float(ctx, 2, minmax, + format, type, values, &ctx->Pack, 0x0); + } + + if (ctx->Pack.BufferObj->Name) { + ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, + ctx->Pack.BufferObj); } if (reset) { @@ -448,34 +698,74 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo } -void +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, "glGetHistogram"); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glGetHistogram"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram"); return; } if (target != GL_HISTOGRAM) { - gl_error(ctx, GL_INVALID_ENUM, "glGetHistogram(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(target)"); return; } - if (!_mesa_is_legal_format_and_type(format, type)) { - gl_error(ctx, GL_INVALID_OPERATION, "glGetHistogram(format or type)"); + 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; } - if (!values) + if (ctx->Pack.BufferObj->Name) { + /* pack min/max values into a PBO */ + GLubyte *buf; + 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)"); + return; + } + buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, + GL_WRITE_ONLY_ARB, + ctx->Pack.BufferObj); + if (!buf) { + /* buffer is already mapped - that's an error */ + _mesa_error(ctx,GL_INVALID_OPERATION,"glGetHistogram(PBO is mapped)"); + return; + } + values = ADD_POINTERS(buf, values); + } + else if (!values) { + /* not an error */ return; + } pack_histogram(ctx, ctx->Histogram.Width, (CONST GLuint (*)[4]) ctx->Histogram.Count, format, type, values, &ctx->Pack); + if (ctx->Pack.BufferObj->Name) { + ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, + ctx->Pack.BufferObj); + } + if (reset) { GLuint i; for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) { @@ -488,19 +778,19 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G } -void +void GLAPIENTRY _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetHistogramParameterfv"); + ASSERT_OUTSIDE_BEGIN_END(ctx); - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv"); return; } if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) { - gl_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(target)"); return; } @@ -530,24 +820,24 @@ _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params) *params = (GLfloat) ctx->Histogram.Sink; break; default: - gl_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(pname)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(pname)"); } } -void +void GLAPIENTRY _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetHistogramParameteriv"); + ASSERT_OUTSIDE_BEGIN_END(ctx); - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv"); return; } if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) { - gl_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(target)"); return; } @@ -577,23 +867,23 @@ _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params) *params = (GLint) ctx->Histogram.Sink; break; default: - gl_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(pname)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(pname)"); } } -void +void GLAPIENTRY _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetMinmaxParameterfv"); + ASSERT_OUTSIDE_BEGIN_END(ctx); - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv"); return; } if (target != GL_MINMAX) { - gl_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameterfv(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameterfv(target)"); return; } if (pname == GL_MINMAX_FORMAT) { @@ -603,23 +893,23 @@ _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params) *params = (GLfloat) ctx->MinMax.Sink; } else { - gl_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameterfv(pname)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameterfv(pname)"); } } -void +void GLAPIENTRY _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetMinmaxParameteriv"); + ASSERT_OUTSIDE_BEGIN_END(ctx); - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv"); return; } if (target != GL_MINMAX) { - gl_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameteriv(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameteriv(target)"); return; } if (pname == GL_MINMAX_FORMAT) { @@ -629,26 +919,26 @@ _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params) *params = (GLint) ctx->MinMax.Sink; } else { - gl_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameteriv(pname)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameteriv(pname)"); } } -void +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, "glHistogram"); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */ - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glHistogram"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram"); return; } if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) { - gl_error(ctx, GL_INVALID_ENUM, "glHistogram(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(target)"); return; } @@ -658,19 +948,19 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s } else { if (width < 0) - gl_error(ctx, GL_INVALID_VALUE, "glHistogram(width)"); + _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)"); else - gl_error(ctx, GL_TABLE_TOO_LARGE, "glHistogram(width)"); + _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glHistogram(width)"); return; } } - if (width != 0 && _mesa_bitcount(width) != 1) { + if (width != 0 && !_mesa_is_pow_two(width)) { if (target == GL_PROXY_HISTOGRAM) { error = GL_TRUE; } else { - gl_error(ctx, GL_INVALID_VALUE, "glHistogram(width)"); + _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)"); return; } } @@ -680,11 +970,13 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s error = GL_TRUE; } else { - gl_error(ctx, GL_INVALID_ENUM, "glHistogram(internalFormat)"); + _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; @@ -706,57 +998,57 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s ctx->Histogram.Width = width; ctx->Histogram.Format = internalFormat; ctx->Histogram.Sink = sink; - ctx->Histogram.RedSize = 0xffffffff; - ctx->Histogram.GreenSize = 0xffffffff; - ctx->Histogram.BlueSize = 0xffffffff; - ctx->Histogram.AlphaSize = 0xffffffff; - ctx->Histogram.LuminanceSize = 0xffffffff; - } - - ctx->NewState |= _NEW_PIXEL; + 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); + } } -void +void GLAPIENTRY _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glMinmax"); + ASSERT_OUTSIDE_BEGIN_END(ctx); - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glMinmax"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax"); return; } if (target != GL_MINMAX) { - gl_error(ctx, GL_INVALID_ENUM, "glMinMax(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(target)"); return; } if (base_histogram_format(internalFormat) < 0) { - gl_error(ctx, GL_INVALID_ENUM, "glMinMax(internalFormat)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(internalFormat)"); return; } + if (ctx->MinMax.Sink == sink) + return; + FLUSH_VERTICES(ctx, _NEW_PIXEL); ctx->MinMax.Sink = sink; - ctx->NewState |= _NEW_PIXEL; } -void +void GLAPIENTRY _mesa_ResetHistogram(GLenum target) { GLuint i; GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glResetHistogram"); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */ - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glResetHistogram"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram"); return; } if (target != GL_HISTOGRAM) { - gl_error(ctx, GL_INVALID_ENUM, "glResetHistogram(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glResetHistogram(target)"); return; } @@ -766,24 +1058,22 @@ _mesa_ResetHistogram(GLenum target) ctx->Histogram.Count[i][2] = 0; ctx->Histogram.Count[i][3] = 0; } - - ctx->NewState |= _NEW_PIXEL; } -void +void GLAPIENTRY _mesa_ResetMinmax(GLenum target) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glResetMinmax"); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_OPERATION, "glResetMinmax"); + if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax"); return; } if (target != GL_MINMAX) { - gl_error(ctx, GL_INVALID_ENUM, "glResetMinMax(target)"); + _mesa_error(ctx, GL_INVALID_ENUM, "glResetMinMax(target)"); return; } @@ -791,5 +1081,39 @@ _mesa_ResetMinmax(GLenum target) 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; - ctx->NewState |= _NEW_PIXEL; +} + + + +/**********************************************************************/ +/***** 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; }