From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 30 Jan 2015 22:24:13 +0000 (-0800)
Subject: main: Add STENCIL_INDEX formats to base_tex_format
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7cc3bb2318aa22ba1e85505ff50706bdacdbbf92;p=mesa.git

main: Add STENCIL_INDEX formats to base_tex_format

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.

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index e067078b17d..29c325bf222 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;