Mesa (master): mesa: enable texture stencil8 for multisample

Dave Airlie airlied at kemper.freedesktop.org
Tue Aug 25 01:07:26 UTC 2015


Module: Mesa
Branch: master
Commit: 529acab22a3e21e0ed0c5243675aec6c0ee27e8f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=529acab22a3e21e0ed0c5243675aec6c0ee27e8f

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 29 18:09:44 2015 +1000

mesa: enable texture stencil8 for multisample

This fixes GL45-CTS.gtf44.GL31Tests.texture_stencil8.texture_stencil8_gl44
from the ogl conform suite.

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: 10.6 11.0 <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/main/teximage.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 253e881..6a5489e 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -5569,10 +5569,13 @@ static GLboolean
 is_renderable_texture_format(struct gl_context *ctx, GLenum internalformat)
 {
    /* Everything that is allowed for renderbuffers,
-    * except for a base format of GL_STENCIL_INDEX.
+    * except for a base format of GL_STENCIL_INDEX, unless supported.
     */
    GLenum baseFormat = _mesa_base_fbo_format(ctx, internalformat);
-   return baseFormat != 0 && baseFormat != GL_STENCIL_INDEX;
+   if (ctx->Extensions.ARB_texture_stencil8)
+      return baseFormat != 0;
+   else
+      return baseFormat != 0 && baseFormat != GL_STENCIL_INDEX;
 }
 
 




More information about the mesa-commit mailing list