OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/device: Use the new emit macro

Browse Source 
Acked-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Jason Ekstrand
2016-04-18 15:32:29 -07:00
parent 932c353592
commit cae2f14947
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/intel/vulkan/anv_batch_chain.c
View File

@@ -455,12 +455,13 @@ emit_batch_buffer_start(struct anv_cmd_buffer *cmd_buffer,
const uint32_t gen8_length = const uint32_t gen8_length =
GEN8_MI_BATCH_BUFFER_START_length - GEN8_MI_BATCH_BUFFER_START_length_bias; GEN8_MI_BATCH_BUFFER_START_length - GEN8_MI_BATCH_BUFFER_START_length_bias;
anv_batch_emit(&cmd_buffer->batch, GEN8_MI_BATCH_BUFFER_START, anv_batch_emit_blk(&cmd_buffer->batch, GEN8_MI_BATCH_BUFFER_START, bbs) {
.DWordLength = cmd_buffer->device->info.gen < 8 ? bbs.DWordLength = cmd_buffer->device->info.gen < 8 ?
gen7_length : gen8_length, gen7_length : gen8_length;
._2ndLevelBatchBuffer = _1stlevelbatch, bbs._2ndLevelBatchBuffer = _1stlevelbatch;
.AddressSpaceIndicator = ASI_PPGTT, bbs.AddressSpaceIndicator = ASI_PPGTT;
.BatchBufferStartAddress = { bo, offset }); bbs.BatchBufferStartAddress = (struct anv_address) { bo, offset };
}
} }
static void static void
@@ -711,11 +712,11 @@ anv_cmd_buffer_end_batch_buffer(struct anv_cmd_buffer *cmd_buffer)
cmd_buffer->batch.end += GEN8_MI_BATCH_BUFFER_START_length * 4; cmd_buffer->batch.end += GEN8_MI_BATCH_BUFFER_START_length * 4;
assert(cmd_buffer->batch.end == batch_bo->bo.map + batch_bo->bo.size); assert(cmd_buffer->batch.end == batch_bo->bo.map + batch_bo->bo.size);
anv_batch_emit(&cmd_buffer->batch, GEN7_MI_BATCH_BUFFER_END); anv_batch_emit_blk(&cmd_buffer->batch, GEN7_MI_BATCH_BUFFER_END, bbe);
/* Round batch up to an even number of dwords. */ /* Round batch up to an even number of dwords. */
if ((cmd_buffer->batch.next - cmd_buffer->batch.start) & 4) if ((cmd_buffer->batch.next - cmd_buffer->batch.start) & 4)
anv_batch_emit(&cmd_buffer->batch, GEN7_MI_NOOP); anv_batch_emit_blk(&cmd_buffer->batch, GEN7_MI_NOOP, noop);
cmd_buffer->exec_mode = ANV_CMD_BUFFER_EXEC_MODE_PRIMARY; cmd_buffer->exec_mode = ANV_CMD_BUFFER_EXEC_MODE_PRIMARY;
} }

8
src/intel/vulkan/anv_device.c
View File

@@ -1081,8 +1081,8 @@ VkResult anv_DeviceWaitIdle(
batch.start = batch.next = cmds; batch.start = batch.next = cmds;
batch.end = (void *) cmds + sizeof(cmds); batch.end = (void *) cmds + sizeof(cmds);
anv_batch_emit(&batch, GEN7_MI_BATCH_BUFFER_END); anv_batch_emit_blk(&batch, GEN7_MI_BATCH_BUFFER_END, bbe);
anv_batch_emit(&batch, GEN7_MI_NOOP); anv_batch_emit_blk(&batch, GEN7_MI_NOOP, noop);
return anv_device_submit_simple_batch(device, &batch); return anv_device_submit_simple_batch(device, &batch);
} }
@@ -1423,8 +1423,8 @@ VkResult anv_CreateFence(
const uint32_t batch_offset = align_u32(sizeof(*fence), CACHELINE_SIZE); const uint32_t batch_offset = align_u32(sizeof(*fence), CACHELINE_SIZE);
batch.next = batch.start = fence->bo.map + batch_offset; batch.next = batch.start = fence->bo.map + batch_offset;
batch.end = fence->bo.map + fence->bo.size; batch.end = fence->bo.map + fence->bo.size;
anv_batch_emit(&batch, GEN7_MI_BATCH_BUFFER_END); anv_batch_emit_blk(&batch, GEN7_MI_BATCH_BUFFER_END, bbe);
anv_batch_emit(&batch, GEN7_MI_NOOP); anv_batch_emit_blk(&batch, GEN7_MI_NOOP, noop);
if (!device->info.has_llc) { if (!device->info.has_llc) {
assert(((uintptr_t) batch.start & CACHELINE_MASK) == 0); assert(((uintptr_t) batch.start & CACHELINE_MASK) == 0);