Attachment 120147 Details for Bug 93126 – fix rg support on es2

[patch] fix rg support on es2

0001-mesa-support-GL_RED-GL_RG-in-ES2-contexts-when-drive.patch (text/plain), 3.11 KB, created by Ilia Mirkin on 2015-11-26 15:34:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Mirkin

Created: 2015-11-26 15:34:57 UTC

Size: 3.11 KB

patch

obsolete

>From 883135f23c9fdff675e311b2a95903a8af5bdec5 Mon Sep 17 00:00:00 2001
>From: Ilia Mirkin <imirkin@alum.mit.edu>
>Date: Thu, 26 Nov 2015 10:32:57 -0500
>Subject: [PATCH] mesa: support GL_RED/GL_RG in ES2 contexts when driver
> support exists
>
>Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
>---
> src/mesa/main/glformats.c | 8 +++++++-
> src/mesa/main/glformats.h | 3 ++-
> src/mesa/main/readpix.c   | 2 +-
> src/mesa/main/teximage.c  | 2 +-
> 4 files changed, 11 insertions(+), 4 deletions(-)
>
>diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
>index 2ed42ea..7b264eb 100644
>--- a/src/mesa/main/glformats.c
>+++ b/src/mesa/main/glformats.c
>@@ -2077,12 +2077,18 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
>  * \return error code, or GL_NO_ERROR.
>  */
> GLenum
>-_mesa_es_error_check_format_and_type(GLenum format, GLenum type,
>+_mesa_es_error_check_format_and_type(const struct gl_context *ctx,
>+                                     GLenum format, GLenum type,
>                                      unsigned dimensions)
> {
>    GLboolean type_valid = GL_TRUE;
> 
>    switch (format) {
>+   case GL_RED:
>+   case GL_RG:
>+      if (!ctx->Extensions.ARB_texture_rg)
>+         return GL_INVALID_VALUE;
>+      /* fallthrough */
>    case GL_ALPHA:
>    case GL_LUMINANCE:
>    case GL_LUMINANCE_ALPHA:
>diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h
>index 92f4bc6..b366855 100644
>--- a/src/mesa/main/glformats.h
>+++ b/src/mesa/main/glformats.h
>@@ -127,7 +127,8 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
>                                   GLenum format, GLenum type);
> 
> extern GLenum
>-_mesa_es_error_check_format_and_type(GLenum format, GLenum type,
>+_mesa_es_error_check_format_and_type(const struct gl_context *ctx,
>+                                     GLenum format, GLenum type,
>                                      unsigned dimensions);
> 
> extern GLenum
>diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
>index 81bb912..8cdc9fe 100644
>--- a/src/mesa/main/readpix.c
>+++ b/src/mesa/main/readpix.c
>@@ -1043,7 +1043,7 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height,
>           _mesa_get_color_read_type(ctx) == type) {
>          err = GL_NO_ERROR;
>       } else if (ctx->Version < 30) {
>-         err = _mesa_es_error_check_format_and_type(format, type, 2);
>+         err = _mesa_es_error_check_format_and_type(ctx, format, type, 2);
>          if (err == GL_NO_ERROR) {
>             if (type == GL_FLOAT || type == GL_HALF_FLOAT_OES) {
>                err = GL_INVALID_OPERATION;
>diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
>index ac7599f..37dbe26 100644
>--- a/src/mesa/main/teximage.c
>+++ b/src/mesa/main/teximage.c
>@@ -1699,7 +1699,7 @@ texture_format_error_check_gles(struct gl_context *ctx, GLenum format,
>       }
>    }
>    else {
>-      err = _mesa_es_error_check_format_and_type(format, type, dimensions);
>+      err = _mesa_es_error_check_format_and_type(ctx, format, type, dimensions);
>       if (err != GL_NO_ERROR) {
>          _mesa_error(ctx, err, "%s(format = %s, type = %s)",
>                      callerName, _mesa_enum_to_string(format),
>-- 
>2.4.10
>

Actions: View | Splinter Review

Attachments on bug 93126: 120147

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.