[Mesa-dev] [PATCH 2/3] Mesa: Add support for HALF_FLOAT_OES type.
Tapani Pälli
tapani.palli at intel.com
Mon Jan 26 23:33:03 PST 2015
Hi;
This needs some amount of rebase, I've done it at
http://cgit.freedesktop.org/~tpalli/mesa/log/?h=float_rebased
Changes are
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
On 01/08/2015 06:30 AM, Kalyan Kondapally wrote:
> This patch adds needed support for accepting HALF_FLOAT_OES as valid type
> for TexImage*D and TexSubImage*D when Texture FLoat extensions are supported.
>
> Signed-off-by: Kevin Rogovin <kevin.rogovin at intel.com>
> Signed-off-by: Kalyan Kondapally <kalyan.kondapally at intel.com>
> ---
> src/mesa/main/glformats.c | 46 ++++++++++++++++++++++++++++++++++++++++++----
> src/mesa/main/glformats.h | 3 ++-
> src/mesa/main/pack.c | 16 ++++++++++++++++
> src/mesa/main/teximage.c | 2 +-
> 4 files changed, 61 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
> index 00478f9..bd597c6 100644
> --- a/src/mesa/main/glformats.c
> +++ b/src/mesa/main/glformats.c
> @@ -93,6 +93,7 @@ _mesa_sizeof_type(GLenum type)
> case GL_DOUBLE:
> return sizeof(GLdouble);
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> return sizeof(GLhalfARB);
> case GL_FIXED:
> return sizeof(GLfixed);
> @@ -125,6 +126,7 @@ _mesa_sizeof_packed_type(GLenum type)
> case GL_INT:
> return sizeof(GLint);
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> return sizeof(GLhalfARB);
> case GL_FLOAT:
> return sizeof(GLfloat);
> @@ -241,6 +243,7 @@ _mesa_bytes_per_pixel(GLenum format, GLenum type)
> case GL_FLOAT:
> return comps * sizeof(GLfloat);
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> return comps * sizeof(GLhalfARB);
> case GL_UNSIGNED_BYTE_3_3_2:
> case GL_UNSIGNED_BYTE_2_3_3_REV:
> @@ -1448,6 +1451,18 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
> }
> return GL_NO_ERROR;
>
> + case GL_HALF_FLOAT_OES:
> + switch (format) {
> + case GL_RGBA:
> + case GL_RGB:
> + case GL_LUMINANCE_ALPHA:
> + case GL_LUMINANCE:
> + case GL_ALPHA:
> + return GL_NO_ERROR;
> + default:
> + return GL_INVALID_OPERATION;
> + }
> +
> default:
> ; /* fall-through */
> }
> @@ -1782,7 +1797,8 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type,
> * \return error code, or GL_NO_ERROR.
> */
> GLenum
> -_mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
> +_mesa_es3_error_check_format_and_type(const struct gl_context *ctx,
> + GLenum format, GLenum type,
> GLenum internalFormat)
> {
> switch (format) {
> @@ -1847,11 +1863,17 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
> case GL_RGBA16F:
> case GL_RGBA32F:
> break;
> + case GL_RGBA:
> + if (ctx->Extensions.OES_texture_float && internalFormat == format)
> + break;
> default:
> return GL_INVALID_OPERATION;
> }
> break;
>
> + case GL_HALF_FLOAT_OES:
> + if (ctx->Extensions.OES_texture_half_float && internalFormat == format)
> + break;
> default:
> return GL_INVALID_OPERATION;
> }
> @@ -1956,11 +1978,19 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
> case GL_R11F_G11F_B10F:
> case GL_RGB9_E5:
> break;
> + case GL_RGB:
> + if (ctx->Extensions.OES_texture_float && internalFormat == format)
> + break;
> default:
> return GL_INVALID_OPERATION;
> }
> break;
>
> + case GL_HALF_FLOAT_OES:
> + if (!ctx->Extensions.OES_texture_half_float || internalFormat != format)
> + return GL_INVALID_OPERATION;
> + break;
> +
> case GL_UNSIGNED_INT_2_10_10_10_REV:
> switch (internalFormat) {
> case GL_RGB: /* GL_EXT_texture_type_2_10_10_10_REV */
> @@ -2200,9 +2230,17 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
> case GL_ALPHA:
> case GL_LUMINANCE:
> case GL_LUMINANCE_ALPHA:
> - if (type != GL_UNSIGNED_BYTE || format != internalFormat)
> - return GL_INVALID_OPERATION;
> - break;
> + switch (type) {
> + case GL_FLOAT:
> + if (ctx->Extensions.OES_texture_float && internalFormat == format)
> + break;
> + case GL_HALF_FLOAT_OES:
> + if (ctx->Extensions.OES_texture_half_float && internalFormat == format)
> + break;
> + default:
> + if (type != GL_UNSIGNED_BYTE || format != internalFormat)
> + return GL_INVALID_OPERATION;
> + }
> }
>
> return GL_NO_ERROR;
> diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h
> index 7b03215..9b1674e 100644
> --- a/src/mesa/main/glformats.h
> +++ b/src/mesa/main/glformats.h
> @@ -122,7 +122,8 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type,
> unsigned dimensions);
>
> extern GLenum
> -_mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
> +_mesa_es3_error_check_format_and_type(const struct gl_context *ctx,
> + GLenum format, GLenum type,
> GLenum internalFormat);
>
>
> diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
> index 649a74c..daafb1e 100644
> --- a/src/mesa/main/pack.c
> +++ b/src/mesa/main/pack.c
> @@ -2301,6 +2301,7 @@ _mesa_pack_rgba_span_float(struct gl_context *ctx, GLuint n, GLfloat rgba[][4],
> }
> break;
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> {
> GLhalfARB *dst = (GLhalfARB *) dstAddr;
> switch (dstFormat) {
> @@ -2724,6 +2725,7 @@ extract_uint_indexes(GLuint n, GLuint indexes[],
> srcType == GL_INT ||
> srcType == GL_UNSIGNED_INT_24_8_EXT ||
> srcType == GL_HALF_FLOAT_ARB ||
> + srcType == GL_HALF_FLOAT_OES ||
> srcType == GL_FLOAT ||
> srcType == GL_FLOAT_32_UNSIGNED_INT_24_8_REV);
>
> @@ -2863,6 +2865,7 @@ extract_uint_indexes(GLuint n, GLuint indexes[],
> }
> break;
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> {
> GLuint i;
> const GLhalfARB *s = (const GLhalfARB *) src;
> @@ -3102,6 +3105,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
> srcType == GL_UNSIGNED_INT ||
> srcType == GL_INT ||
> srcType == GL_HALF_FLOAT_ARB ||
> + srcType == GL_HALF_FLOAT_OES ||
> srcType == GL_FLOAT ||
> srcType == GL_UNSIGNED_BYTE_3_3_2 ||
> srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
> @@ -3219,6 +3223,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
> PROCESS(aSrc, ACOMP, 1.0F, 1.0F, GLfloat, (GLfloat));
> break;
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> PROCESS(rSrc, RCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
> PROCESS(gSrc, GCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
> PROCESS(bSrc, BCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
> @@ -3717,6 +3722,7 @@ extract_uint_rgba(GLuint n, GLuint rgba[][4],
> srcType == GL_UNSIGNED_INT ||
> srcType == GL_INT ||
> srcType == GL_HALF_FLOAT_ARB ||
> + srcType == GL_HALF_FLOAT_OES ||
> srcType == GL_FLOAT ||
> srcType == GL_UNSIGNED_BYTE_3_3_2 ||
> srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
> @@ -3814,6 +3820,7 @@ extract_uint_rgba(GLuint n, GLuint rgba[][4],
> PROCESS(aSrc, ACOMP, 1, GLfloat, clamp_float_to_uint);
> break;
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> PROCESS(rSrc, RCOMP, 0, GLhalfARB, clamp_half_to_uint);
> PROCESS(gSrc, GCOMP, 0, GLhalfARB, clamp_half_to_uint);
> PROCESS(bSrc, BCOMP, 0, GLhalfARB, clamp_half_to_uint);
> @@ -4218,6 +4225,7 @@ _mesa_unpack_color_span_ubyte(struct gl_context *ctx,
> srcType == GL_UNSIGNED_INT ||
> srcType == GL_INT ||
> srcType == GL_HALF_FLOAT_ARB ||
> + srcType == GL_HALF_FLOAT_OES ||
> srcType == GL_FLOAT ||
> srcType == GL_UNSIGNED_BYTE_3_3_2 ||
> srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
> @@ -4471,6 +4479,7 @@ _mesa_unpack_color_span_float( struct gl_context *ctx,
> srcType == GL_UNSIGNED_INT ||
> srcType == GL_INT ||
> srcType == GL_HALF_FLOAT_ARB ||
> + srcType == GL_HALF_FLOAT_OES ||
> srcType == GL_FLOAT ||
> srcType == GL_UNSIGNED_BYTE_3_3_2 ||
> srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
> @@ -4675,6 +4684,7 @@ _mesa_unpack_color_span_uint(struct gl_context *ctx,
> srcType == GL_UNSIGNED_INT ||
> srcType == GL_INT ||
> srcType == GL_HALF_FLOAT_ARB ||
> + srcType == GL_HALF_FLOAT_OES ||
> srcType == GL_FLOAT ||
> srcType == GL_UNSIGNED_BYTE_3_3_2 ||
> srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
> @@ -4803,6 +4813,7 @@ _mesa_unpack_index_span( struct gl_context *ctx, GLuint n,
> srcType == GL_UNSIGNED_INT ||
> srcType == GL_INT ||
> srcType == GL_HALF_FLOAT_ARB ||
> + srcType == GL_HALF_FLOAT_OES ||
> srcType == GL_FLOAT);
>
> ASSERT(dstType == GL_UNSIGNED_BYTE ||
> @@ -4974,6 +4985,7 @@ _mesa_pack_index_span( struct gl_context *ctx, GLuint n,
> }
> break;
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> {
> GLhalfARB *dst = (GLhalfARB *) dest;
> GLuint i;
> @@ -5023,6 +5035,7 @@ _mesa_unpack_stencil_span( struct gl_context *ctx, GLuint n,
> srcType == GL_INT ||
> srcType == GL_UNSIGNED_INT_24_8_EXT ||
> srcType == GL_HALF_FLOAT_ARB ||
> + srcType == GL_HALF_FLOAT_OES ||
> srcType == GL_FLOAT ||
> srcType == GL_FLOAT_32_UNSIGNED_INT_24_8_REV);
>
> @@ -5213,6 +5226,7 @@ _mesa_pack_stencil_span( struct gl_context *ctx, GLuint n,
> }
> break;
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> {
> GLhalfARB *dst = (GLhalfARB *) dest;
> GLuint i;
> @@ -5430,6 +5444,7 @@ _mesa_unpack_depth_span( struct gl_context *ctx, GLuint n,
> needClamp = GL_TRUE;
> break;
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> {
> GLuint i;
> const GLhalfARB *src = (const GLhalfARB *) source;
> @@ -5619,6 +5634,7 @@ _mesa_pack_depth_span( struct gl_context *ctx, GLuint n, GLvoid *dest,
> }
> break;
> case GL_HALF_FLOAT_ARB:
> + case GL_HALF_FLOAT_OES:
> {
> GLhalfARB *dst = (GLhalfARB *) dest;
> GLuint i;
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 45ffc95..98866bd 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -2186,7 +2186,7 @@ texture_error_check( struct gl_context *ctx,
>
> if (_mesa_is_gles(ctx)) {
> if (_mesa_is_gles3(ctx)) {
> - err = _mesa_es3_error_check_format_and_type(format, type,
> + err = _mesa_es3_error_check_format_and_type(ctx, format, type,
> internalFormat);
> } else {
> if (format != internalFormat) {
>
More information about the mesa-dev
mailing list