Module: Mesa
Branch: 10.6
Commit: 4f531da24b88661af8f49becb5296a78ec79ce54
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f531da24b88661af8f49becb5296a78ec79ce54

Author: Emil Velikov <[email protected]>
Date:   Thu Sep 10 14:02:04 2015 +0100

Revert "i965: Momentarily pretend to support ARB_texture_stencil8 for blits."

This reverts commit 6811df8d3510c35899e992bae82c063e20e62cc8.

Erroneous nomination. See mailing list for details.

---

 src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c 
b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
index d079197..fc7018d 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
@@ -414,12 +414,6 @@ brw_meta_stencil_blit(struct brw_context *brw,
    GLenum target;
 
    _mesa_meta_fb_tex_blit_begin(ctx, &blit);
-   /* XXX: Pretend to support stencil textures so _mesa_base_tex_format()
-    * returns a valid format.  When we properly support the extension, we
-    * should remove this.
-    */
-   assert(ctx->Extensions.ARB_texture_stencil8 == false);
-   ctx->Extensions.ARB_texture_stencil8 = true;
 
    _mesa_GenFramebuffers(1, &fbo);
    /* Force the surface to be configured for level zero. */
@@ -457,7 +451,6 @@ brw_meta_stencil_blit(struct brw_context *brw,
    _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
 error:
-   ctx->Extensions.ARB_texture_stencil8 = false;
    _mesa_meta_fb_tex_blit_end(ctx, target, &blit);
    _mesa_meta_end(ctx);
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to