From: Eduardo Lima Mitev <elima@igalia.com>
Date: Tue, 22 Dec 2015 17:38:06 +0000 (+0100)
Subject: mesa/formatquery: Add READ_PIXELS_FORMAT pname
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bec286f7246bedba9f7f34185f2e1e29befec3ab;p=mesa.git

mesa/formatquery: Add READ_PIXELS_FORMAT pname

Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c
index 28d82a206eb..a5f7c774a9d 100644
--- a/src/mesa/main/formatquery.c
+++ b/src/mesa/main/formatquery.c
@@ -598,9 +598,7 @@ _mesa_query_internal_format_default(struct gl_context *ctx, GLenum target,
                                     GLenum internalFormat, GLenum pname,
                                     GLint *params)
 {
-   (void) ctx;
    (void) target;
-   (void) internalFormat;
 
    switch (pname) {
    case GL_SAMPLES:
@@ -616,6 +614,26 @@ _mesa_query_internal_format_default(struct gl_context *ctx, GLenum target,
       params[0] = internalFormat;
       break;
 
+   case GL_READ_PIXELS_FORMAT: {
+      GLenum base_format = _mesa_base_tex_format(ctx, internalFormat);
+      switch (base_format) {
+      case GL_STENCIL_INDEX:
+      case GL_DEPTH_COMPONENT:
+      case GL_DEPTH_STENCIL:
+      case GL_RED:
+      case GL_RGB:
+      case GL_BGR:
+      case GL_RGBA:
+      case GL_BGRA:
+         params[0] = base_format;
+         break;
+      default:
+         params[0] = GL_NONE;
+         break;
+      }
+      break;
+   }
+
    case GL_MANUAL_GENERATE_MIPMAP:
    case GL_AUTO_GENERATE_MIPMAP:
    case GL_SRGB_READ:
@@ -1090,14 +1108,11 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
       break;
 
    case GL_READ_PIXELS:
+   case GL_READ_PIXELS_FORMAT:
       ctx->Driver.QueryInternalFormat(ctx, target, internalformat, pname,
                                       buffer);
       break;
 
-   case GL_READ_PIXELS_FORMAT:
-      /* @TODO */
-      break;
-
    case GL_READ_PIXELS_TYPE:
       /* @TODO */
       break;