瀏覽代碼

r600g: add assembler support for other vtx fetch fields.

this shouldn't change behaviour, just push the choice of what
to do out to the shader.
tags/snb-magic
Dave Airlie 15 年之前
父節點
當前提交
e973221538
共有 3 個檔案被更改,包括 11 行新增1 行删除
  1. 5
    1
      src/gallium/drivers/r600/r600_asm.c
  2. 5
    0
      src/gallium/drivers/r600/r600_asm.h
  3. 1
    0
      src/gallium/drivers/r600/r600_shader.c

+ 5
- 1
src/gallium/drivers/r600/r600_asm.c 查看文件

@@ -601,7 +601,11 @@ static int r600_bc_vtx_build(struct r600_bc *bc, struct r600_bc_vtx *vtx, unsign
S_SQ_VTX_WORD1_DST_SEL_Y(vtx->dst_sel_y) |
S_SQ_VTX_WORD1_DST_SEL_Z(vtx->dst_sel_z) |
S_SQ_VTX_WORD1_DST_SEL_W(vtx->dst_sel_w) |
S_SQ_VTX_WORD1_USE_CONST_FIELDS(1) |
S_SQ_VTX_WORD1_USE_CONST_FIELDS(vtx->use_const_fields) |
S_SQ_VTX_WORD1_DATA_FORMAT(vtx->data_format) |
S_SQ_VTX_WORD1_NUM_FORMAT_ALL(vtx->num_format_all) |
S_SQ_VTX_WORD1_FORMAT_COMP_ALL(vtx->format_comp_all) |
S_SQ_VTX_WORD1_SRF_MODE_ALL(vtx->srf_mode_all) |
S_SQ_VTX_WORD1_GPR_DST_GPR(vtx->dst_gpr);
bc->bytecode[id++] = S_SQ_VTX_WORD2_MEGA_FETCH(1);
bc->bytecode[id++] = 0;

+ 5
- 0
src/gallium/drivers/r600/r600_asm.h 查看文件

@@ -101,6 +101,11 @@ struct r600_bc_vtx {
unsigned dst_sel_y;
unsigned dst_sel_z;
unsigned dst_sel_w;
unsigned use_const_fields;
unsigned data_format;
unsigned num_format_all;
unsigned format_comp_all;
unsigned srf_mode_all;
};

struct r600_bc_output {

+ 1
- 0
src/gallium/drivers/r600/r600_shader.c 查看文件

@@ -439,6 +439,7 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
vtx.dst_sel_y = 1;
vtx.dst_sel_z = 2;
vtx.dst_sel_w = 3;
vtx.use_const_fields = 1;
r = r600_bc_add_vtx(ctx->bc, &vtx);
if (r)
return r;

Loading…
取消
儲存