Mesa (master): broadcom/vc5: Fix pasteo that broke vertex texturing.

Eric Anholt anholt at kemper.freedesktop.org
Fri Oct 20 23:01:05 UTC 2017


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

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Oct 20 12:32:36 2017 -0700

broadcom/vc5: Fix pasteo that broke vertex texturing.

We weren't ever filling in the texture state record, so we'd dereference
NULL from the shader.

---

 src/gallium/drivers/vc5/vc5_emit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/vc5/vc5_emit.c
index 9b82ff9071..3cb44feff9 100644
--- a/src/gallium/drivers/vc5/vc5_emit.c
+++ b/src/gallium/drivers/vc5/vc5_emit.c
@@ -408,7 +408,7 @@ vc5_emit_state(struct pipe_context *pctx)
                 emit_textures(vc5, &vc5->fragtex);
 
         if (vc5->dirty & VC5_DIRTY_VERTTEX)
-                emit_textures(vc5, &vc5->fragtex);
+                emit_textures(vc5, &vc5->verttex);
 
         if (vc5->dirty & VC5_DIRTY_FLAT_SHADE_FLAGS) {
                 /* XXX: Need to handle more than 24 entries. */




More information about the mesa-commit mailing list