Merge remote branch 'vdpau/pipe-video' into pipe-video

[mesa.git] / src / gallium / drivers / r600 / r600_asm.h

diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h
index 259b264e4d95f8468772fe3e0d8bce410481c89a..519245f3af258fd947c8e7b552de4ee0a7f7aebd 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.h
+++ b/src/gallium/drivers/r600/r600_asm.h
@@ -108,15 +108,19 @@ struct r600_bc_vtx {
 struct r600_bc_output {
        unsigned                        array_base;
        unsigned                        type;
-       unsigned                        end_of_program;
-       unsigned                        inst;
        unsigned                        elem_size;
        unsigned                        gpr;
        unsigned                        swizzle_x;
        unsigned                        swizzle_y;
        unsigned                        swizzle_z;
        unsigned                        swizzle_w;
-       unsigned                        barrier;
+       unsigned                        burst_count;
+};
+
+struct r600_bc_kcache {
+       unsigned                        bank;
+       unsigned                        mode;
+       unsigned                        addr;
 };
 
 struct r600_bc_cf {
@@ -128,12 +132,8 @@ struct r600_bc_cf {
        unsigned                        cond;
        unsigned                        pop_count;
        unsigned                        cf_addr; /* control flow addr */
-       unsigned                        kcache0_mode;
-       unsigned                        kcache1_mode;
-       unsigned                        kcache0_addr;
-       unsigned                        kcache1_addr;
-       unsigned                        kcache0_bank;
-       unsigned                        kcache1_bank;
+       unsigned                        barrier;
+       struct r600_bc_kcache           kcache[2];
        unsigned                        r6xx_uses_waterfall;
        struct list_head                alu;
        struct list_head                tex;