[Mesa-dev] [PATCH] mesa: change state query return value for RGB565

[Jason Ekstrand]

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

I also ran it through our CI system and it didn't find any problems.

On Fri, Aug 12, 2016 at 2:34 PM, Haixia Shi <hshi at chromium.org> wrote:

> The GL_BGR and GL_UNSIGNED_SHORT_5_6_5_REV are not defined anywhere in
> OpenGL ES 3.2 (or earlier) specification, and there are no known extensions
> in the Khronos registry that would add these enums as valid responses for
> glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE) and
> glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT) queries.
>
> Note that this patch does not change the bit layout returned by the query.
> As
> defined by the GL spec, the bit layout of GL_RGB + GL_UNSIGNED_SHORT_5_6_5
> and
> GL_BGR + GL_UNSIGNED_SHORT_5_6_5_REV are identical.
>
> TEST=dEQP-GLES3.functional.state_query.integers.*
>
> Signed-off-by: Haixia Shi <hshi at chromium.org>
> Cc: Chad Versace <chadversary at chromium.org>
> Cc: Stéphane Marchesin <marcheu at chromium.org>
>
> Change-Id: I81bbc8ccdc7e125edaeae443baf6fa8fdefcc6b6
> ---
>  src/mesa/main/framebuffer.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
> index 38bd680..f024f5e 100644
> --- a/src/mesa/main/framebuffer.c
> +++ b/src/mesa/main/framebuffer.c
> @@ -857,7 +857,7 @@ _mesa_get_color_read_format(struct gl_context *ctx)
>        if (format == MESA_FORMAT_B8G8R8A8_UNORM)
>           return GL_BGRA;
>        else if (format == MESA_FORMAT_B5G6R5_UNORM)
> -         return GL_BGR;
> +         return GL_RGB;
>        else if (format == MESA_FORMAT_R_UNORM8)
>           return GL_RED;
>
> @@ -892,7 +892,7 @@ _mesa_get_color_read_type(struct gl_context *ctx)
>        const GLenum data_type = _mesa_get_format_datatype(format);
>
>        if (format == MESA_FORMAT_B5G6R5_UNORM)
> -         return GL_UNSIGNED_SHORT_5_6_5_REV;
> +         return GL_UNSIGNED_SHORT_5_6_5;
>
>        switch (data_type) {
>        case GL_SIGNED_NORMALIZED:
> --
> 2.8.0.rc3.226.g39d4020
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160812/33e368c2/attachment.html>