Mesa (10.4): glsl_to_tgsi: fix a bug in copy propagation
Emil Velikov
evelikov at kemper.freedesktop.org
Sun Jan 4 22:07:03 UTC 2015
Module: Mesa
Branch: 10.4
Commit: b9e56ea151c179439836aeaf8e768723ce8a4197
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9e56ea151c179439836aeaf8e768723ce8a4197
Author: Marek Olšák <marek.olsak at amd.com>
Date: Fri Jan 2 14:13:43 2015 +0100
glsl_to_tgsi: fix a bug in copy propagation
This fixes the new piglit test: arb_uniform_buffer_object/2-buffers-bug
Cc: 10.2 10.3 10.4 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 48094d0e6554a9df36bf00fc2793ade46cf92406)
---
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 5f30355..ed7746c 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -3527,7 +3527,8 @@ glsl_to_tgsi_visitor::copy_propagate(void)
first = copy_chan;
} else {
if (first->src[0].file != copy_chan->src[0].file ||
- first->src[0].index != copy_chan->src[0].index) {
+ first->src[0].index != copy_chan->src[0].index ||
+ first->src[0].index2D != copy_chan->src[0].index2D) {
good = false;
break;
}
More information about the mesa-commit
mailing list