From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Thu, 12 Jun 2014 01:07:36 +0000 (-0700)
Subject: meta: Use _mesa_get_format_bits() to get the GL_RED_BITS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7de90890c64d019c56e5a06e427b207220729997;p=mesa.git

meta: Use _mesa_get_format_bits() to get the GL_RED_BITS

We currently get red bits from ctx->DrawBuffer->Visual.redBits
by making a false assumption that the texture we're writing to
(in glCopyTexImage2D()) is used as a DrawBuffer.

Fixes many failures in gles3 Khronos CTS test:
copy_tex_image_conversions_required

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index a2a7b2d48ff..79fbf4919cb 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -2733,6 +2733,7 @@ static GLenum
 get_temp_image_type(struct gl_context *ctx, mesa_format format)
 {
    const GLenum baseFormat = _mesa_get_format_base_format(format);
+   const GLint format_red_bits = _mesa_get_format_bits(format, GL_RED_BITS);
 
    switch (baseFormat) {
    case GL_RGBA:
@@ -2743,9 +2744,9 @@ get_temp_image_type(struct gl_context *ctx, mesa_format format)
    case GL_LUMINANCE:
    case GL_LUMINANCE_ALPHA:
    case GL_INTENSITY:
-      if (ctx->DrawBuffer->Visual.redBits <= 8) {
+      if (format_red_bits <= 8) {
          return GL_UNSIGNED_BYTE;
-      } else if (ctx->DrawBuffer->Visual.redBits <= 16) {
+      } else if (format_red_bits <= 16) {
          return GL_UNSIGNED_SHORT;
       } else {
          GLenum datatype = _mesa_get_format_datatype(format);