r600g: use modulo for computing index into query (ring) buffers

[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 a9123299f1e6568274a9c4e9fce6bdd0e6f14c43..61caa4b915e24304bd7b0606828803d361b36b23 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.h
+++ b/src/gallium/drivers/r600/r600_asm.h
@@ -23,20 +23,19 @@
 #ifndef R600_ASM_H
 #define R600_ASM_H
 
-#include "util/u_double_list.h"
-
 struct r600_vertex_element;
 struct r600_pipe_context;
 
-struct r600_bc_alu_src {
+struct r600_bytecode_alu_src {
        unsigned                        sel;
        unsigned                        chan;
        unsigned                        neg;
        unsigned                        abs;
        unsigned                        rel;
+       uint32_t                        value;
 };
 
-struct r600_bc_alu_dst {
+struct r600_bytecode_alu_dst {
        unsigned                        sel;
        unsigned                        chan;
        unsigned                        clamp;
@@ -44,24 +43,20 @@ struct r600_bc_alu_dst {
        unsigned                        rel;
 };
 
-struct r600_bc_alu {
+struct r600_bytecode_alu {
        struct list_head                list;
-       struct list_head                bs_list; /* bank swizzle list */
-       struct r600_bc_alu_src          src[3];
-       struct r600_bc_alu_dst          dst;
+       struct r600_bytecode_alu_src            src[3];
+       struct r600_bytecode_alu_dst            dst;
        unsigned                        inst;
        unsigned                        last;
        unsigned                        is_op3;
        unsigned                        predicate;
-       unsigned                        nliteral;
-       unsigned                        literal_added;
        unsigned                        bank_swizzle;
        unsigned                        bank_swizzle_force;
-       u32                             value[4];
        unsigned                        omod;
 };
 
-struct r600_bc_tex {
+struct r600_bytecode_tex {
        struct list_head                list;
        unsigned                        inst;
        unsigned                        resource_id;
@@ -88,7 +83,7 @@ struct r600_bc_tex {
        unsigned                        src_sel_w;
 };
 
-struct r600_bc_vtx {
+struct r600_bytecode_vtx {
        struct list_head                list;
        unsigned                        inst;
        unsigned                        fetch_type;
@@ -106,9 +101,11 @@ struct r600_bc_vtx {
        unsigned                        num_format_all;
        unsigned                        format_comp_all;
        unsigned                        srf_mode_all;
+       unsigned                        offset;
+       unsigned                        endian;
 };
 
-struct r600_bc_output {
+struct r600_bytecode_output {
        unsigned                        array_base;
        unsigned                        type;
        unsigned                        end_of_program;
@@ -119,16 +116,17 @@ struct r600_bc_output {
        unsigned                        swizzle_y;
        unsigned                        swizzle_z;
        unsigned                        swizzle_w;
+       unsigned                        burst_count;
        unsigned                        barrier;
 };
 
-struct r600_bc_kcache {
+struct r600_bytecode_kcache {
        unsigned                        bank;
        unsigned                        mode;
        unsigned                        addr;
 };
 
-struct r600_bc_cf {
+struct r600_bytecode_cf {
        struct list_head                list;
        unsigned                        inst;
        unsigned                        addr;
@@ -137,13 +135,15 @@ struct r600_bc_cf {
        unsigned                        cond;
        unsigned                        pop_count;
        unsigned                        cf_addr; /* control flow addr */
-       struct r600_bc_kcache           kcache[2];
+       struct r600_bytecode_kcache             kcache[2];
        unsigned                        r6xx_uses_waterfall;
        struct list_head                alu;
        struct list_head                tex;
        struct list_head                vtx;
-       struct r600_bc_output           output;
-       struct r600_bc_alu              *curr_bs_head;
+       struct r600_bytecode_output             output;
+       struct r600_bytecode_alu                *curr_bs_head;
+       struct r600_bytecode_alu                *prev_bs_head;
+       struct r600_bytecode_alu                *prev2_bs_head;
 };
 
 #define FC_NONE                                0
@@ -155,8 +155,8 @@ struct r600_bc_cf {
 
 struct r600_cf_stack_entry {
        int                             type;
-       struct r600_bc_cf               *start;
-       struct r600_bc_cf               **mid; /* used to store the else point */
+       struct r600_bytecode_cf         *start;
+       struct r600_bytecode_cf         **mid; /* used to store the else point */
        int                             num_mid;
 };
 
@@ -168,12 +168,11 @@ struct r600_cf_callstack {
        int                             max;
 };
 
-struct r600_bc {
-       enum radeon_family              family;
-       int                             chiprev; /* 0 - r600, 1 - r700, 2 - evergreen */
+struct r600_bytecode {
+       enum chip_class                 chip_class;
        int                             type;
        struct list_head                cf;
-       struct r600_bc_cf               *cf_last;
+       struct r600_bytecode_cf         *cf_last;
        unsigned                        ndw;
        unsigned                        ncf;
        unsigned                        ngpr;
@@ -188,27 +187,27 @@ struct r600_bc {
 };
 
 /* eg_asm.c */
-int eg_bc_cf_build(struct r600_bc *bc, struct r600_bc_cf *cf);
-void eg_cf_vtx(struct r600_vertex_element *ve, u32 *bytecode, unsigned count);
+int eg_bytecode_cf_build(struct r600_bytecode *bc, struct r600_bytecode_cf *cf);
 
 /* r600_asm.c */
-int r600_bc_init(struct r600_bc *bc, enum radeon_family family);
-void r600_bc_clear(struct r600_bc *bc);
-int r600_bc_add_alu(struct r600_bc *bc, const struct r600_bc_alu *alu);
-int r600_bc_add_literal(struct r600_bc *bc, const u32 *value);
-int r600_bc_add_vtx(struct r600_bc *bc, const struct r600_bc_vtx *vtx);
-int r600_bc_add_tex(struct r600_bc *bc, const struct r600_bc_tex *tex);
-int r600_bc_add_output(struct r600_bc *bc, const struct r600_bc_output *output);
-int r600_bc_build(struct r600_bc *bc);
-int r600_bc_add_cfinst(struct r600_bc *bc, int inst);
-int r600_bc_add_alu_type(struct r600_bc *bc, const struct r600_bc_alu *alu, int type);
-void r600_bc_dump(struct r600_bc *bc);
-void r600_cf_vtx(struct r600_vertex_element *ve, u32 *bytecode, unsigned count);
-void r600_cf_vtx_tc(struct r600_vertex_element *ve, u32 *bytecode, unsigned count);
+void r600_bytecode_init(struct r600_bytecode *bc, enum chip_class chip_class);
+void r600_bytecode_clear(struct r600_bytecode *bc);
+int r600_bytecode_add_alu(struct r600_bytecode *bc, const struct r600_bytecode_alu *alu);
+int r600_bytecode_add_vtx(struct r600_bytecode *bc, const struct r600_bytecode_vtx *vtx);
+int r600_bytecode_add_tex(struct r600_bytecode *bc, const struct r600_bytecode_tex *tex);
+int r600_bytecode_add_output(struct r600_bytecode *bc, const struct r600_bytecode_output *output);
+int r600_bytecode_build(struct r600_bytecode *bc);
+int r600_bytecode_add_cfinst(struct r600_bytecode *bc, int inst);
+int r600_bytecode_add_alu_type(struct r600_bytecode *bc, const struct r600_bytecode_alu *alu, int type);
+void r600_bytecode_special_constants(u32 value, unsigned *sel, unsigned *neg);
+void r600_bytecode_dump(struct r600_bytecode *bc);
+
+int cm_bytecode_add_cf_end(struct r600_bytecode *bc);
 
 int r600_vertex_elements_build_fetch_shader(struct r600_pipe_context *rctx, struct r600_vertex_element *ve);
 
 /* r700_asm.c */
-int r700_bc_alu_build(struct r600_bc *bc, struct r600_bc_alu *alu, unsigned id);
+void r700_bytecode_cf_vtx_build(uint32_t *bytecode, const struct r600_bytecode_cf *cf);
+int r700_bytecode_alu_build(struct r600_bytecode *bc, struct r600_bytecode_alu *alu, unsigned id);
 
 #endif