From: Jason Ekstrand <jason@jlekstrand.net>
Date: Fri, 27 Feb 2015 23:53:11 +0000 (-0500)
Subject: main/base_tex_format: Properly handle STENCIL_INDEX1/4/16
X-Git-Tag: upstream/17.1.0~20332
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4925d7f3b66d63fbdd7b7607cd809db1e58bee9;p=platform%2Fupstream%2Fmesa.git

main/base_tex_format: Properly handle STENCIL_INDEX1/4/16

This takes "fbo-stencil blit GL_STENCIL_INDEX1/4/16" from crash to pass on
BDW.

Cc: 10.5 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 5ea48c5..611d664 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -224,7 +224,10 @@ _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_INDEX1:
+      case GL_STENCIL_INDEX4:
       case GL_STENCIL_INDEX8:
+      case GL_STENCIL_INDEX16:
          return GL_STENCIL_INDEX;
       default:
          ; /* fallthrough */