diff options
| author | Vincent Lejeune <[email protected]> | 2013-03-26 15:00:18 +0100 |
|---|---|---|
| committer | Vincent Lejeune <[email protected]> | 2013-04-01 23:43:27 +0200 |
| commit | af38695f5105a2f766f3df393c3e42067c3706f2 (patch) | |
| tree | 4f022b0e47bb3c9ed389236579084e714e189f60 /src/gallium/drivers | |
| parent | bc0cc2944ff13549df8276b856acc79254c5db07 (diff) | |
r600g/llvm: Add support for cf_alu native encode
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r600/r600_asm.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_asm.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 0d570ca2505..65c705d0aa8 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -106,7 +106,7 @@ void r600_bytecode_init(struct r600_bytecode *bc, bc->msaa_texture_mode = msaa_texture_mode; } -static int r600_bytecode_add_cf(struct r600_bytecode *bc) +int r600_bytecode_add_cf(struct r600_bytecode *bc) { struct r600_bytecode_cf *cf = r600_bytecode_cf(); diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h index 1465c313b79..c1aa3bae4e3 100644 --- a/src/gallium/drivers/r600/r600_asm.h +++ b/src/gallium/drivers/r600/r600_asm.h @@ -227,6 +227,7 @@ int r600_bytecode_add_tex(struct r600_bytecode *bc, 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_cf(struct r600_bytecode *bc); int r600_bytecode_add_cfinst(struct r600_bytecode *bc, unsigned op); int r600_bytecode_add_alu_type(struct r600_bytecode *bc, diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 1e2155939ed..c51773af5b2 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -626,6 +626,20 @@ static void r600_bytecode_from_byte_stream(struct r600_shader_ctx *ctx, bytes_read = r600_export_from_byte_stream(ctx, bytes, bytes_read); break; + case 6: { + int32_t word0 = i32_from_byte_stream(bytes, &bytes_read); + int32_t word1 = i32_from_byte_stream(bytes, &bytes_read); + + r600_bytecode_add_cf(ctx->bc); + ctx->bc->cf_last->op = r600_isa_cf_by_opcode(ctx->bc->isa, 8/* CF_ALU*/, 1); + ctx->bc->cf_last->kcache[0].bank = G_SQ_CF_ALU_WORD0_KCACHE_BANK0(word0); + ctx->bc->cf_last->kcache[0].addr = G_SQ_CF_ALU_WORD1_KCACHE_ADDR0(word1); + ctx->bc->cf_last->kcache[0].mode = G_SQ_CF_ALU_WORD0_KCACHE_MODE0(word0); + ctx->bc->cf_last->kcache[1].bank = G_SQ_CF_ALU_WORD0_KCACHE_BANK1(word0); + ctx->bc->cf_last->kcache[1].addr = G_SQ_CF_ALU_WORD1_KCACHE_ADDR1(word1); + ctx->bc->cf_last->kcache[1].mode = G_SQ_CF_ALU_WORD1_KCACHE_MODE1(word1); + break; + } default: /* XXX: Error here */ break; |