summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r600/r600_asm.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2010-08-11 14:26:07 -0400
committerJerome Glisse <jglisse@redhat.com>2010-08-11 14:26:07 -0400
commit481b65abaedb271d0da24c75b8c60f7bcf6d8ce9 (patch)
treef971d82636747472e9806976687faf2a308d6f02 /src/gallium/drivers/r600/r600_asm.c
parent1bb0427a856ffa3fea1b177ea5b0395a00de3833 (diff)
r600g: accept empty frag prog shader
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'src/gallium/drivers/r600/r600_asm.c')
-rw-r--r--src/gallium/drivers/r600/r600_asm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index ae818bf19b..9ea9d4354d 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -167,8 +167,7 @@ int r600_bc_add_literal(struct r600_bc *bc, const u32 *value)
struct r600_bc_alu *alu;
if (bc->cf_last == NULL) {
- R600_ERR("no last CF\n");
- return -EINVAL;
+ return 0;
}
if (bc->cf_last->inst == V_SQ_CF_WORD1_SQ_CF_INST_TEX) {
return 0;