Attachment 80099 Details for Bug 65173 – patch which generates GL_INVALID_ENUM

[patch] patch which generates GL_INVALID_ENUM

framebuffer.c.patch (text/plain), 3.07 KB, created by Brian Paul on 2013-05-31 14:56:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2013-05-31 14:56:50 UTC

Size: 3.07 KB

patch

obsolete

>diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
>index af3c595..0337b8b 100644
>--- a/src/mesa/main/framebuffer.c
>+++ b/src/mesa/main/framebuffer.c
>@@ -878,18 +878,29 @@ _mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format)
> GLenum
> _mesa_get_color_read_format(struct gl_context *ctx)
> {
>-   const GLenum data_type = _mesa_get_format_datatype(
>-                               ctx->ReadBuffer->_ColorReadBuffer->Format);
>-
>-   switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {
>-   case MESA_FORMAT_ARGB8888:
>-      return GL_BGRA;
>-   case MESA_FORMAT_RGB565:
>-      return GL_BGR;
>-   default:
>-      if (data_type == GL_UNSIGNED_INT || data_type == GL_INT) {
>+   if (!ctx->ReadBuffer || !ctx->ReadBuffer->_ColorReadBuffer) {
>+      /* The spec is unclear how to handle this case, but NVIDIA's
>+       * driver generates GL_INVALID_OPERATION.
>+       */
>+      _mesa_error(ctx, GL_INVALID_OPERATION,
>+                  "glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT: "
>+                  "no GL_READ_BUFFER)");
>+      return GL_NONE;
>+   }
>+   else {
>+      const GLenum format = ctx->ReadBuffer->_ColorReadBuffer->Format;
>+      const GLenum data_type = _mesa_get_format_datatype(format);
>+
>+      if (format == MESA_FORMAT_ARGB8888)
>+         return GL_BGRA;
>+      else if (format == MESA_FORMAT_RGB565)
>+         return GL_BGR;
>+
>+      switch (data_type) {
>+      case GL_UNSIGNED_INT:
>+      case GL_INT:
>          return GL_RGBA_INTEGER;
>-      } else {
>+      default:
>          return GL_RGBA;
>       }
>    }
>@@ -902,26 +913,33 @@ _mesa_get_color_read_format(struct gl_context *ctx)
> GLenum
> _mesa_get_color_read_type(struct gl_context *ctx)
> {
>-   const GLenum data_type = _mesa_get_format_datatype(
>-                               ctx->ReadBuffer->_ColorReadBuffer->Format);
>-
>-   switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {
>-   case MESA_FORMAT_RGB565:
>-      return GL_UNSIGNED_SHORT_5_6_5_REV;
>-   default:
>-      break;
>+   if (!ctx->ReadBuffer || !ctx->ReadBuffer->_ColorReadBuffer) {
>+      /* The spec is unclear how to handle this case, but NVIDIA's
>+       * driver generates GL_INVALID_OPERATION.
>+       */
>+      _mesa_error(ctx, GL_INVALID_OPERATION,
>+                  "glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE: "
>+                  "no GL_READ_BUFFER)");
>+      return GL_NONE;
>    }
>-
>-   switch (data_type) {
>-   case GL_SIGNED_NORMALIZED:
>-      return GL_BYTE;
>-   case GL_UNSIGNED_INT:
>-   case GL_INT:
>-   case GL_FLOAT:
>-      return data_type;
>-   case GL_UNSIGNED_NORMALIZED:
>-   default:
>-      return GL_UNSIGNED_BYTE;
>+   else {
>+      const GLenum format = ctx->ReadBuffer->_ColorReadBuffer->Format;
>+      const GLenum data_type = _mesa_get_format_datatype(format);
>+
>+      if (format == MESA_FORMAT_RGB565)
>+         return GL_UNSIGNED_SHORT_5_6_5_REV;
>+
>+      switch (data_type) {
>+      case GL_SIGNED_NORMALIZED:
>+         return GL_BYTE;
>+      case GL_UNSIGNED_INT:
>+      case GL_INT:
>+      case GL_FLOAT:
>+         return data_type;
>+      case GL_UNSIGNED_NORMALIZED:
>+      default:
>+         return GL_UNSIGNED_BYTE;
>+      }
>    }
> }
>

Actions: View | Splinter Review

Attachments on bug 65173: 80036 | 80037 | 80070 | 80099

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.