r600: add support for valid pixel mode on CF clauses

This just adds support to the assembler for setting the valid
pixel mode on the CF clause.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/eg_asm.c b/src/gallium/drivers/r600/eg_asm.c
index 6840cf6f18a32dfe391909b5e6f0a850f83ddc27..19915cff8cbda69423549767d6893b499cb6e3e1 100644 (file)
--- a/src/gallium/drivers/r600/eg_asm.c
+++ b/src/gallium/drivers/r600/eg_asm.c
@@ -73,6 +73,7 @@ int eg_bytecode_cf_build(struct r600_bytecode *bc, struct r600_bytecode_cf *cf)
                        bc->bytecode[id++] = S_SQ_CF_WORD0_ADDR(cf->addr >> 1);
                        bc->bytecode[id++] = S_SQ_CF_WORD1_CF_INST(opcode) |
                                        S_SQ_CF_WORD1_BARRIER(1) |
+                                       S_SQ_CF_WORD1_VALID_PIXEL_MODE(cf->vpm) |
                                        S_SQ_CF_WORD1_COUNT((cf->ndw / 4) - 1);
                } else if (cfop->flags & CF_EXP) {
                        /* EXPORT instructions */

diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h
index 91fe260c577056613240ad50e5bcaab3c19b188f..aa044c51ff7e9957f25c301c833cd3dbbc2dbe80 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.h
+++ b/src/gallium/drivers/r600/r600_asm.h
@@ -180,6 +180,7 @@ struct r600_bytecode_cf {
        unsigned                        eg_alu_extended;
        unsigned                        barrier;
        unsigned                        end_of_program;
+       unsigned                        vpm;
        struct list_head                alu;
        struct list_head                tex;
        struct list_head                vtx;