diff options
| author | Francisco Jerez <[email protected]> | 2015-04-22 21:10:43 +0300 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2015-05-04 15:05:20 +0300 |
| commit | 0519a6259b0e6b83eaeafdf0ed30a67713c4b6ed (patch) | |
| tree | ba1b421edbea8239d9808ee03542b1f91fd2a682 /src/mesa/drivers/dri/i965/brw_fs_generator.cpp | |
| parent | 2f1c16df3e997771bcedb60ae7f16a21c4c60144 (diff) | |
i965: Simplify generator code for untyped surface messages.
The generate_untyped_*() methods do nothing useful other than calling
the corresponding function from brw_eu_emit.c. The calls to
brw_mark_surface_used() will go away too in a future commit.
Reviewed-by: Topi Pohjolainen <[email protected]>
Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs_generator.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index e28f4430be8..ff7e85fbb71 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -1529,37 +1529,6 @@ fs_generator::generate_shader_time_add(fs_inst *inst, } void -fs_generator::generate_untyped_atomic(fs_inst *inst, struct brw_reg dst, - struct brw_reg payload, - struct brw_reg atomic_op, - struct brw_reg surf_index) -{ - assert(atomic_op.file == BRW_IMMEDIATE_VALUE && - atomic_op.type == BRW_REGISTER_TYPE_UD && - surf_index.file == BRW_IMMEDIATE_VALUE && - surf_index.type == BRW_REGISTER_TYPE_UD); - - brw_untyped_atomic(p, dst, payload, - surf_index, atomic_op.dw1.ud, - inst->mlen, true); - - brw_mark_surface_used(prog_data, surf_index.dw1.ud); -} - -void -fs_generator::generate_untyped_surface_read(fs_inst *inst, struct brw_reg dst, - struct brw_reg payload, - struct brw_reg surf_index) -{ - assert(surf_index.file == BRW_IMMEDIATE_VALUE && - surf_index.type == BRW_REGISTER_TYPE_UD); - - brw_untyped_surface_read(p, dst, payload, surf_index, inst->mlen, 1); - - brw_mark_surface_used(prog_data, surf_index.dw1.ud); -} - -void fs_generator::enable_debug(const char *shader_name) { debug_flag = true; @@ -2046,11 +2015,18 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width) break; case SHADER_OPCODE_UNTYPED_ATOMIC: - generate_untyped_atomic(inst, dst, src[0], src[1], src[2]); + assert(src[1].file == BRW_IMMEDIATE_VALUE && + src[2].file == BRW_IMMEDIATE_VALUE); + brw_untyped_atomic(p, dst, src[0], src[2], src[1].dw1.ud, + inst->mlen, true); + brw_mark_surface_used(prog_data, src[2].dw1.ud); break; case SHADER_OPCODE_UNTYPED_SURFACE_READ: - generate_untyped_surface_read(inst, dst, src[0], src[1]); + assert(src[1].file == BRW_IMMEDIATE_VALUE); + brw_untyped_surface_read(p, dst, src[0], src[1], + inst->mlen, 1); + brw_mark_surface_used(prog_data, src[1].dw1.ud); break; case FS_OPCODE_SET_SIMD4X2_OFFSET: |