[Mesa-stable] Fwd: [PATCH v2 2/2] main: Add STENCIL_INDEX formats to base_tex_format

[Jason Ekstrand]

This patch should go in stable

SHA in master is 7cc3bb2318aa22ba1e85505ff50706bdacdbbf92

--Jason

---------- Forwarded message ----------
From: Jason Ekstrand <jason at jlekstrand.net>
Date: Fri, Jan 30, 2015 at 3:45 PM
Subject: [PATCH v2 2/2] main: Add STENCIL_INDEX formats to base_tex_format
To: mesa-dev at lists.freedesktop.org
Cc: Jason Ekstrand <jason.ekstrand at intel.com>


This fixes a bug on BDW when our meta-based stencil blit path assert-fails
due to an invalid internal format even though we do support the
ARB_stencil_texturing extension.
---
 src/mesa/main/teximage.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index e067078..29c325b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -221,6 +221,16 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint
internalFormat )
       }
    }

+   if (ctx->Extensions.ARB_stencil_texturing) {
+      switch (internalFormat) {
+      case GL_STENCIL_INDEX:
+      case GL_STENCIL_INDEX8:
+         return GL_STENCIL_INDEX;
+      default:
+         ; /* fallthrough */
+      }
+   }
+
    switch (internalFormat) {
    case GL_COMPRESSED_ALPHA:
       return GL_ALPHA;
--
2.2.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20150227/e3ced776/attachment.html>