summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-02-11 11:08:30 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-02-11 11:08:30 +0000
commit9381dd590f2e45acb8fbb0aa5503c917b832204d (patch)
tree27da150a5acdf0b7495b97b2c2af066b674661de
parent8c0391726a89414356c705fcc2d5a38d12d0fe2b (diff)
downloadexternal_mesa3d-9381dd590f2e45acb8fbb0aa5503c917b832204d.zip
external_mesa3d-9381dd590f2e45acb8fbb0aa5503c917b832204d.tar.gz
external_mesa3d-9381dd590f2e45acb8fbb0aa5503c917b832204d.tar.bz2
llvmpipe: Handle TGSI_TOKEN_TYPE_PROPERTY.
Avoids assertion failures with certain shaders.
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_interp.c1
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_interp.c b/src/gallium/auxiliary/gallivm/lp_bld_interp.c
index a6acaea..2fc8940 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_interp.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_interp.c
@@ -376,6 +376,7 @@ lp_build_interp_soa_init(struct lp_build_interp_soa_context *bld,
case TGSI_TOKEN_TYPE_INSTRUCTION:
case TGSI_TOKEN_TYPE_IMMEDIATE:
+ case TGSI_TOKEN_TYPE_PROPERTY:
break;
default:
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index 2896c52..4cf28a9 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -1498,6 +1498,9 @@ lp_build_tgsi_soa(LLVMBuilderRef builder,
}
break;
+ case TGSI_TOKEN_TYPE_PROPERTY:
+ break;
+
default:
assert( 0 );
}