diff options
| author | Samuel Pitoiset <[email protected]> | 2018-06-20 16:10:55 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2018-06-21 10:31:02 +0200 |
| commit | 41f6096c26860e02d4377e58d93454965531ece8 (patch) | |
| tree | 44de6f037b93d198868c8e51e61925c921aac76e /src/amd | |
| parent | 53959fcbd88f38316359aa7b48cb9464c23eb870 (diff) | |
radv: use EOP_DATA_SEL_* instead of magic numbers
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_query.c | 9 | ||||
| -rw-r--r-- | src/amd/vulkan/si_cmd_buffer.c | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 2afb35292a6..8bd41bc41ac 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -4241,7 +4241,7 @@ static void write_event(struct radv_cmd_buffer *cmd_buffer, cmd_buffer->device->physical_device->rad_info.chip_class, radv_cmd_buffer_uses_mec(cmd_buffer), V_028A90_BOTTOM_OF_PIPE_TS, 0, - 1, va, 2, value); + EOP_DATA_SEL_VALUE_32BIT, va, 2, value); assert(cmd_buffer->cs->cdw <= cdw_max); } diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index 559b7cd49dc..e1c91630ff4 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -1169,7 +1169,8 @@ static void emit_end_query(struct radv_cmd_buffer *cmd_buffer, cmd_buffer->device->physical_device->rad_info.chip_class, radv_cmd_buffer_uses_mec(cmd_buffer), V_028A90_BOTTOM_OF_PIPE_TS, 0, - 1, avail_va, 0, 1); + EOP_DATA_SEL_VALUE_32BIT, + avail_va, 0, 1); break; default: unreachable("ending unhandled query type"); @@ -1292,13 +1293,15 @@ void radv_CmdWriteTimestamp( cmd_buffer->device->physical_device->rad_info.chip_class, mec, V_028A90_BOTTOM_OF_PIPE_TS, 0, - 3, query_va, 0, 0); + EOP_DATA_SEL_TIMESTAMP, + query_va, 0, 0); si_cs_emit_write_event_eop(cs, false, cmd_buffer->device->physical_device->rad_info.chip_class, mec, V_028A90_BOTTOM_OF_PIPE_TS, 0, - 1, avail_va, 0, 1); + EOP_DATA_SEL_VALUE_32BIT, + avail_va, 0, 1); break; } query_va += pool->stride; diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index a663d2add6d..d6b073c7838 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -799,7 +799,9 @@ si_cs_emit_cache_flush(struct radeon_cmdbuf *cs, chip_class, is_mec, V_028A90_FLUSH_AND_INV_CB_DATA_TS, - 0, 0, 0, 0, 0); + 0, + EOP_DATA_SEL_DISCARD, + 0, 0, 0); } } if (flush_bits & RADV_CMD_FLAG_FLUSH_AND_INV_DB) { @@ -867,7 +869,8 @@ si_cs_emit_cache_flush(struct radeon_cmdbuf *cs, assert(flush_cnt); uint32_t old_fence = (*flush_cnt)++; - si_cs_emit_write_event_eop(cs, false, chip_class, false, cb_db_event, tc_flags, 1, + si_cs_emit_write_event_eop(cs, false, chip_class, false, cb_db_event, tc_flags, + EOP_DATA_SEL_VALUE_32BIT, flush_va, old_fence, *flush_cnt); si_emit_wait_fence(cs, false, flush_va, *flush_cnt, 0xffffffff); } |