openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-12-04 05:33:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i965: Simplify generator code for untyped surface messages.

Browse Source 
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 <topi.pohjolainen@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Francisco Jerez 2015-04-22 21:10:43 +03:00
parent 2f1c16df3e
commit 0519a6259b
4 changed files with 18 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mesa/drivers/dri/i965/brw_fs.h
View File

@ -638,17 +638,6 @@ private:
struct brw_reg offset,
struct brw_reg value);
void generate_untyped_atomic(fs_inst *inst,
struct brw_reg dst,
struct brw_reg payload,
struct brw_reg atomic_op,
struct brw_reg surf_index);
void generate_untyped_surface_read(fs_inst *inst,
struct brw_reg dst,
struct brw_reg payload,
struct brw_reg surf_index);
bool patch_discard_jumps_to_fb_writes();
struct brw_context *brw;

42
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
View File

@ -1528,37 +1528,6 @@ fs_generator::generate_shader_time_add(fs_inst *inst,
prog_data->binding_table.shader_time_start);
}
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)
{
@ -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:

9
src/mesa/drivers/dri/i965/brw_vec4.h
View File

@ -504,15 +504,6 @@ private:
struct brw_reg dst);
void generate_unpack_flags(struct brw_reg dst);
void generate_untyped_atomic(vec4_instruction *inst,
struct brw_reg dst,
struct brw_reg atomic_op,
struct brw_reg surf_index);
void generate_untyped_surface_read(vec4_instruction *inst,
struct brw_reg dst,
struct brw_reg surf_index);
struct brw_context *brw;
const struct brw_device_info *devinfo;

43
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
View File

@ -1110,38 +1110,6 @@ vec4_generator::generate_set_simd4x2_header_gen9(vec4_instruction *inst,
brw_pop_insn_state(p);
}
void
vec4_generator::generate_untyped_atomic(vec4_instruction *inst,
struct brw_reg dst,
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, brw_message_reg(inst->base_mrf),
surf_index, atomic_op.dw1.ud,
inst->mlen, true);
brw_mark_surface_used(&prog_data->base, surf_index.dw1.ud);
}
void
vec4_generator::generate_untyped_surface_read(vec4_instruction *inst,
struct brw_reg dst,
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, brw_message_reg(inst->base_mrf),
surf_index, inst->mlen, 1);
brw_mark_surface_used(&prog_data->base, surf_index.dw1.ud);
}
void
vec4_generator::generate_code(const cfg_t *cfg)
{
@ -1501,11 +1469,18 @@ vec4_generator::generate_code(const cfg_t *cfg)
break;
case SHADER_OPCODE_UNTYPED_ATOMIC:
generate_untyped_atomic(inst, dst, src[0], src[1]);
assert(src[0].file == BRW_IMMEDIATE_VALUE &&
src[1].file == BRW_IMMEDIATE_VALUE);
brw_untyped_atomic(p, dst, brw_message_reg(inst->base_mrf),
src[1], src[0].dw1.ud, inst->mlen, true);
brw_mark_surface_used(&prog_data->base, src[1].dw1.ud);
break;
case SHADER_OPCODE_UNTYPED_SURFACE_READ:
generate_untyped_surface_read(inst, dst, src[0]);
assert(src[0].file == BRW_IMMEDIATE_VALUE);
brw_untyped_surface_read(p, dst, brw_message_reg(inst->base_mrf),
src[0], inst->mlen, 1);
brw_mark_surface_used(&prog_data->base, src[0].dw1.ud);
break;
case VS_OPCODE_UNPACK_FLAGS_SIMD4X2: