vk: Reorder gen8 specific code into three new files
We'll organize gen specific code in three files per gen: pipeline, cmd_buffer and state, eg: gen8_cmd_buffer.c gen8_pipeline.c gen8_state.c where gen8_cmd_buffer.c holds all vkCmd* entry points, gne8_pipeline.c all gen specific code related to pipeline building and remaining state code (sampler, surface state, dynamic state) in gen8_state.c. Signed-off-by: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
This commit is contained in:
@@ -320,9 +320,9 @@ void anv_CmdBindVertexBuffers(
|
||||
}
|
||||
}
|
||||
|
||||
static VkResult
|
||||
cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
|
||||
unsigned stage, struct anv_state *bt_state)
|
||||
VkResult
|
||||
anv_cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
|
||||
unsigned stage, struct anv_state *bt_state)
|
||||
{
|
||||
struct anv_framebuffer *fb = cmd_buffer->state.framebuffer;
|
||||
struct anv_subpass *subpass = cmd_buffer->state.subpass;
|
||||
@@ -440,9 +440,9 @@ cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
cmd_buffer_emit_samplers(struct anv_cmd_buffer *cmd_buffer,
|
||||
unsigned stage, struct anv_state *state)
|
||||
VkResult
|
||||
anv_cmd_buffer_emit_samplers(struct anv_cmd_buffer *cmd_buffer,
|
||||
unsigned stage, struct anv_state *state)
|
||||
{
|
||||
struct anv_pipeline_layout *layout;
|
||||
uint32_t sampler_count;
|
||||
@@ -491,10 +491,10 @@ flush_descriptor_set(struct anv_cmd_buffer *cmd_buffer, uint32_t stage)
|
||||
struct anv_state surfaces = { 0, }, samplers = { 0, };
|
||||
VkResult result;
|
||||
|
||||
result = cmd_buffer_emit_samplers(cmd_buffer, stage, &samplers);
|
||||
result = anv_cmd_buffer_emit_samplers(cmd_buffer, stage, &samplers);
|
||||
if (result != VK_SUCCESS)
|
||||
return result;
|
||||
result = cmd_buffer_emit_binding_table(cmd_buffer, stage, &surfaces);
|
||||
result = anv_cmd_buffer_emit_binding_table(cmd_buffer, stage, &surfaces);
|
||||
if (result != VK_SUCCESS)
|
||||
return result;
|
||||
|
||||
@@ -533,8 +533,8 @@ flush_descriptor_set(struct anv_cmd_buffer *cmd_buffer, uint32_t stage)
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static void
|
||||
flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer)
|
||||
void
|
||||
anv_flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer)
|
||||
{
|
||||
uint32_t s, dirty = cmd_buffer->state.descriptors_dirty &
|
||||
cmd_buffer->state.pipeline->active_stages;
|
||||
@@ -569,7 +569,7 @@ flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer)
|
||||
cmd_buffer->state.descriptors_dirty &= ~cmd_buffer->state.pipeline->active_stages;
|
||||
}
|
||||
|
||||
static struct anv_state
|
||||
struct anv_state
|
||||
anv_cmd_buffer_emit_dynamic(struct anv_cmd_buffer *cmd_buffer,
|
||||
uint32_t *a, uint32_t dwords, uint32_t alignment)
|
||||
{
|
||||
@@ -584,7 +584,7 @@ anv_cmd_buffer_emit_dynamic(struct anv_cmd_buffer *cmd_buffer,
|
||||
return state;
|
||||
}
|
||||
|
||||
static struct anv_state
|
||||
struct anv_state
|
||||
anv_cmd_buffer_merge_dynamic(struct anv_cmd_buffer *cmd_buffer,
|
||||
uint32_t *a, uint32_t *b,
|
||||
uint32_t dwords, uint32_t alignment)
|
||||
@@ -603,363 +603,11 @@ anv_cmd_buffer_merge_dynamic(struct anv_cmd_buffer *cmd_buffer,
|
||||
return state;
|
||||
}
|
||||
|
||||
static VkResult
|
||||
flush_compute_descriptor_set(struct anv_cmd_buffer *cmd_buffer)
|
||||
void
|
||||
anv_cmd_buffer_begin_subpass(struct anv_cmd_buffer *cmd_buffer,
|
||||
struct anv_subpass *subpass)
|
||||
{
|
||||
struct anv_device *device = cmd_buffer->device;
|
||||
struct anv_pipeline *pipeline = cmd_buffer->state.compute_pipeline;
|
||||
struct anv_state surfaces = { 0, }, samplers = { 0, };
|
||||
VkResult result;
|
||||
|
||||
result = cmd_buffer_emit_samplers(cmd_buffer,
|
||||
VK_SHADER_STAGE_COMPUTE, &samplers);
|
||||
if (result != VK_SUCCESS)
|
||||
return result;
|
||||
result = cmd_buffer_emit_binding_table(cmd_buffer,
|
||||
VK_SHADER_STAGE_COMPUTE, &surfaces);
|
||||
if (result != VK_SUCCESS)
|
||||
return result;
|
||||
|
||||
struct GEN8_INTERFACE_DESCRIPTOR_DATA desc = {
|
||||
.KernelStartPointer = pipeline->cs_simd,
|
||||
.KernelStartPointerHigh = 0,
|
||||
.BindingTablePointer = surfaces.offset,
|
||||
.BindingTableEntryCount = 0,
|
||||
.SamplerStatePointer = samplers.offset,
|
||||
.SamplerCount = 0,
|
||||
.NumberofThreadsinGPGPUThreadGroup = 0 /* FIXME: Really? */
|
||||
};
|
||||
|
||||
uint32_t size = GEN8_INTERFACE_DESCRIPTOR_DATA_length * sizeof(uint32_t);
|
||||
struct anv_state state =
|
||||
anv_state_pool_alloc(&device->dynamic_state_pool, size, 64);
|
||||
|
||||
GEN8_INTERFACE_DESCRIPTOR_DATA_pack(NULL, state.map, &desc);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD,
|
||||
.InterfaceDescriptorTotalLength = size,
|
||||
.InterfaceDescriptorDataStartAddress = state.offset);
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
static void
|
||||
anv_cmd_buffer_flush_compute_state(struct anv_cmd_buffer *cmd_buffer)
|
||||
{
|
||||
struct anv_pipeline *pipeline = cmd_buffer->state.compute_pipeline;
|
||||
VkResult result;
|
||||
|
||||
assert(pipeline->active_stages == VK_SHADER_STAGE_COMPUTE_BIT);
|
||||
|
||||
if (cmd_buffer->state.current_pipeline != GPGPU) {
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_PIPELINE_SELECT,
|
||||
.PipelineSelection = GPGPU);
|
||||
cmd_buffer->state.current_pipeline = GPGPU;
|
||||
}
|
||||
|
||||
if (cmd_buffer->state.compute_dirty & ANV_CMD_BUFFER_PIPELINE_DIRTY)
|
||||
anv_batch_emit_batch(&cmd_buffer->batch, &pipeline->batch);
|
||||
|
||||
if ((cmd_buffer->state.descriptors_dirty & VK_SHADER_STAGE_COMPUTE_BIT) ||
|
||||
(cmd_buffer->state.compute_dirty & ANV_CMD_BUFFER_PIPELINE_DIRTY)) {
|
||||
result = flush_compute_descriptor_set(cmd_buffer);
|
||||
assert(result == VK_SUCCESS);
|
||||
cmd_buffer->state.descriptors_dirty &= ~VK_SHADER_STAGE_COMPUTE;
|
||||
}
|
||||
|
||||
cmd_buffer->state.compute_dirty = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
anv_cmd_buffer_flush_state(struct anv_cmd_buffer *cmd_buffer)
|
||||
{
|
||||
struct anv_pipeline *pipeline = cmd_buffer->state.pipeline;
|
||||
uint32_t *p;
|
||||
|
||||
uint32_t vb_emit = cmd_buffer->state.vb_dirty & pipeline->vb_used;
|
||||
|
||||
assert((pipeline->active_stages & VK_SHADER_STAGE_COMPUTE_BIT) == 0);
|
||||
|
||||
if (cmd_buffer->state.current_pipeline != _3D) {
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_PIPELINE_SELECT,
|
||||
.PipelineSelection = _3D);
|
||||
cmd_buffer->state.current_pipeline = _3D;
|
||||
}
|
||||
|
||||
if (vb_emit) {
|
||||
const uint32_t num_buffers = __builtin_popcount(vb_emit);
|
||||
const uint32_t num_dwords = 1 + num_buffers * 4;
|
||||
|
||||
p = anv_batch_emitn(&cmd_buffer->batch, num_dwords,
|
||||
GEN8_3DSTATE_VERTEX_BUFFERS);
|
||||
uint32_t vb, i = 0;
|
||||
for_each_bit(vb, vb_emit) {
|
||||
struct anv_buffer *buffer = cmd_buffer->state.vertex_bindings[vb].buffer;
|
||||
uint32_t offset = cmd_buffer->state.vertex_bindings[vb].offset;
|
||||
|
||||
struct GEN8_VERTEX_BUFFER_STATE state = {
|
||||
.VertexBufferIndex = vb,
|
||||
.MemoryObjectControlState = GEN8_MOCS,
|
||||
.AddressModifyEnable = true,
|
||||
.BufferPitch = pipeline->binding_stride[vb],
|
||||
.BufferStartingAddress = { buffer->bo, buffer->offset + offset },
|
||||
.BufferSize = buffer->size - offset
|
||||
};
|
||||
|
||||
GEN8_VERTEX_BUFFER_STATE_pack(&cmd_buffer->batch, &p[1 + i * 4], &state);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
if (cmd_buffer->state.dirty & ANV_CMD_BUFFER_PIPELINE_DIRTY) {
|
||||
/* If somebody compiled a pipeline after starting a command buffer the
|
||||
* scratch bo may have grown since we started this cmd buffer (and
|
||||
* emitted STATE_BASE_ADDRESS). If we're binding that pipeline now,
|
||||
* reemit STATE_BASE_ADDRESS so that we use the bigger scratch bo. */
|
||||
if (cmd_buffer->state.scratch_size < pipeline->total_scratch)
|
||||
anv_cmd_buffer_emit_state_base_address(cmd_buffer);
|
||||
|
||||
anv_batch_emit_batch(&cmd_buffer->batch, &pipeline->batch);
|
||||
}
|
||||
|
||||
if (cmd_buffer->state.descriptors_dirty)
|
||||
flush_descriptor_sets(cmd_buffer);
|
||||
|
||||
if (cmd_buffer->state.dirty & ANV_CMD_BUFFER_VP_DIRTY) {
|
||||
struct anv_dynamic_vp_state *vp_state = cmd_buffer->state.vp_state;
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_SCISSOR_STATE_POINTERS,
|
||||
.ScissorRectPointer = vp_state->scissor.offset);
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC,
|
||||
.CCViewportPointer = vp_state->cc_vp.offset);
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP,
|
||||
.SFClipViewportPointer = vp_state->sf_clip_vp.offset);
|
||||
}
|
||||
|
||||
if (cmd_buffer->state.dirty & (ANV_CMD_BUFFER_PIPELINE_DIRTY |
|
||||
ANV_CMD_BUFFER_RS_DIRTY)) {
|
||||
anv_batch_emit_merge(&cmd_buffer->batch,
|
||||
cmd_buffer->state.rs_state->state_sf,
|
||||
pipeline->state_sf);
|
||||
anv_batch_emit_merge(&cmd_buffer->batch,
|
||||
cmd_buffer->state.rs_state->state_raster,
|
||||
pipeline->state_raster);
|
||||
}
|
||||
|
||||
if (cmd_buffer->state.ds_state &&
|
||||
(cmd_buffer->state.dirty & (ANV_CMD_BUFFER_PIPELINE_DIRTY |
|
||||
ANV_CMD_BUFFER_DS_DIRTY))) {
|
||||
anv_batch_emit_merge(&cmd_buffer->batch,
|
||||
cmd_buffer->state.ds_state->state_wm_depth_stencil,
|
||||
pipeline->state_wm_depth_stencil);
|
||||
}
|
||||
|
||||
if (cmd_buffer->state.dirty & (ANV_CMD_BUFFER_CB_DIRTY |
|
||||
ANV_CMD_BUFFER_DS_DIRTY)) {
|
||||
struct anv_state state;
|
||||
if (cmd_buffer->state.ds_state == NULL)
|
||||
state = anv_cmd_buffer_emit_dynamic(cmd_buffer,
|
||||
cmd_buffer->state.cb_state->state_color_calc,
|
||||
GEN8_COLOR_CALC_STATE_length, 64);
|
||||
else if (cmd_buffer->state.cb_state == NULL)
|
||||
state = anv_cmd_buffer_emit_dynamic(cmd_buffer,
|
||||
cmd_buffer->state.ds_state->state_color_calc,
|
||||
GEN8_COLOR_CALC_STATE_length, 64);
|
||||
else
|
||||
state = anv_cmd_buffer_merge_dynamic(cmd_buffer,
|
||||
cmd_buffer->state.ds_state->state_color_calc,
|
||||
cmd_buffer->state.cb_state->state_color_calc,
|
||||
GEN8_COLOR_CALC_STATE_length, 64);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch,
|
||||
GEN8_3DSTATE_CC_STATE_POINTERS,
|
||||
.ColorCalcStatePointer = state.offset,
|
||||
.ColorCalcStatePointerValid = true);
|
||||
}
|
||||
|
||||
if (cmd_buffer->state.dirty & (ANV_CMD_BUFFER_PIPELINE_DIRTY |
|
||||
ANV_CMD_BUFFER_INDEX_BUFFER_DIRTY)) {
|
||||
anv_batch_emit_merge(&cmd_buffer->batch,
|
||||
cmd_buffer->state.state_vf, pipeline->state_vf);
|
||||
}
|
||||
|
||||
cmd_buffer->state.vb_dirty &= ~vb_emit;
|
||||
cmd_buffer->state.dirty = 0;
|
||||
}
|
||||
|
||||
void anv_CmdDraw(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
uint32_t firstVertex,
|
||||
uint32_t vertexCount,
|
||||
uint32_t firstInstance,
|
||||
uint32_t instanceCount)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
|
||||
anv_cmd_buffer_flush_state(cmd_buffer);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DPRIMITIVE,
|
||||
.VertexAccessType = SEQUENTIAL,
|
||||
.VertexCountPerInstance = vertexCount,
|
||||
.StartVertexLocation = firstVertex,
|
||||
.InstanceCount = instanceCount,
|
||||
.StartInstanceLocation = firstInstance,
|
||||
.BaseVertexLocation = 0);
|
||||
}
|
||||
|
||||
void anv_CmdDrawIndexed(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
uint32_t firstIndex,
|
||||
uint32_t indexCount,
|
||||
int32_t vertexOffset,
|
||||
uint32_t firstInstance,
|
||||
uint32_t instanceCount)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
|
||||
anv_cmd_buffer_flush_state(cmd_buffer);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DPRIMITIVE,
|
||||
.VertexAccessType = RANDOM,
|
||||
.VertexCountPerInstance = indexCount,
|
||||
.StartVertexLocation = firstIndex,
|
||||
.InstanceCount = instanceCount,
|
||||
.StartInstanceLocation = firstInstance,
|
||||
.BaseVertexLocation = vertexOffset);
|
||||
}
|
||||
|
||||
static void
|
||||
anv_batch_lrm(struct anv_batch *batch,
|
||||
uint32_t reg, struct anv_bo *bo, uint32_t offset)
|
||||
{
|
||||
anv_batch_emit(batch, GEN8_MI_LOAD_REGISTER_MEM,
|
||||
.RegisterAddress = reg,
|
||||
.MemoryAddress = { bo, offset });
|
||||
}
|
||||
|
||||
static void
|
||||
anv_batch_lri(struct anv_batch *batch, uint32_t reg, uint32_t imm)
|
||||
{
|
||||
anv_batch_emit(batch, GEN8_MI_LOAD_REGISTER_IMM,
|
||||
.RegisterOffset = reg,
|
||||
.DataDWord = imm);
|
||||
}
|
||||
|
||||
/* Auto-Draw / Indirect Registers */
|
||||
#define GEN7_3DPRIM_END_OFFSET 0x2420
|
||||
#define GEN7_3DPRIM_START_VERTEX 0x2430
|
||||
#define GEN7_3DPRIM_VERTEX_COUNT 0x2434
|
||||
#define GEN7_3DPRIM_INSTANCE_COUNT 0x2438
|
||||
#define GEN7_3DPRIM_START_INSTANCE 0x243C
|
||||
#define GEN7_3DPRIM_BASE_VERTEX 0x2440
|
||||
|
||||
void anv_CmdDrawIndirect(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
VkBuffer _buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t stride)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
ANV_FROM_HANDLE(anv_buffer, buffer, _buffer);
|
||||
struct anv_bo *bo = buffer->bo;
|
||||
uint32_t bo_offset = buffer->offset + offset;
|
||||
|
||||
anv_cmd_buffer_flush_state(cmd_buffer);
|
||||
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_VERTEX_COUNT, bo, bo_offset);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_INSTANCE_COUNT, bo, bo_offset + 4);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_START_VERTEX, bo, bo_offset + 8);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_START_INSTANCE, bo, bo_offset + 12);
|
||||
anv_batch_lri(&cmd_buffer->batch, GEN7_3DPRIM_BASE_VERTEX, 0);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DPRIMITIVE,
|
||||
.IndirectParameterEnable = true,
|
||||
.VertexAccessType = SEQUENTIAL);
|
||||
}
|
||||
|
||||
void anv_CmdDrawIndexedIndirect(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
VkBuffer _buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t stride)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
ANV_FROM_HANDLE(anv_buffer, buffer, _buffer);
|
||||
struct anv_bo *bo = buffer->bo;
|
||||
uint32_t bo_offset = buffer->offset + offset;
|
||||
|
||||
anv_cmd_buffer_flush_state(cmd_buffer);
|
||||
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_VERTEX_COUNT, bo, bo_offset);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_INSTANCE_COUNT, bo, bo_offset + 4);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_START_VERTEX, bo, bo_offset + 8);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_BASE_VERTEX, bo, bo_offset + 12);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GEN7_3DPRIM_START_INSTANCE, bo, bo_offset + 16);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DPRIMITIVE,
|
||||
.IndirectParameterEnable = true,
|
||||
.VertexAccessType = RANDOM);
|
||||
}
|
||||
|
||||
void anv_CmdDispatch(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
uint32_t z)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
struct anv_pipeline *pipeline = cmd_buffer->state.compute_pipeline;
|
||||
struct brw_cs_prog_data *prog_data = &pipeline->cs_prog_data;
|
||||
|
||||
anv_cmd_buffer_flush_compute_state(cmd_buffer);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_GPGPU_WALKER,
|
||||
.SIMDSize = prog_data->simd_size / 16,
|
||||
.ThreadDepthCounterMaximum = 0,
|
||||
.ThreadHeightCounterMaximum = 0,
|
||||
.ThreadWidthCounterMaximum = pipeline->cs_thread_width_max,
|
||||
.ThreadGroupIDXDimension = x,
|
||||
.ThreadGroupIDYDimension = y,
|
||||
.ThreadGroupIDZDimension = z,
|
||||
.RightExecutionMask = pipeline->cs_right_mask,
|
||||
.BottomExecutionMask = 0xffffffff);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_MEDIA_STATE_FLUSH);
|
||||
}
|
||||
|
||||
#define GPGPU_DISPATCHDIMX 0x2500
|
||||
#define GPGPU_DISPATCHDIMY 0x2504
|
||||
#define GPGPU_DISPATCHDIMZ 0x2508
|
||||
|
||||
void anv_CmdDispatchIndirect(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
VkBuffer _buffer,
|
||||
VkDeviceSize offset)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
ANV_FROM_HANDLE(anv_buffer, buffer, _buffer);
|
||||
struct anv_pipeline *pipeline = cmd_buffer->state.compute_pipeline;
|
||||
struct brw_cs_prog_data *prog_data = &pipeline->cs_prog_data;
|
||||
struct anv_bo *bo = buffer->bo;
|
||||
uint32_t bo_offset = buffer->offset + offset;
|
||||
|
||||
anv_cmd_buffer_flush_compute_state(cmd_buffer);
|
||||
|
||||
anv_batch_lrm(&cmd_buffer->batch, GPGPU_DISPATCHDIMX, bo, bo_offset);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GPGPU_DISPATCHDIMY, bo, bo_offset + 4);
|
||||
anv_batch_lrm(&cmd_buffer->batch, GPGPU_DISPATCHDIMZ, bo, bo_offset + 8);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_GPGPU_WALKER,
|
||||
.IndirectParameterEnable = true,
|
||||
.SIMDSize = prog_data->simd_size / 16,
|
||||
.ThreadDepthCounterMaximum = 0,
|
||||
.ThreadHeightCounterMaximum = 0,
|
||||
.ThreadWidthCounterMaximum = pipeline->cs_thread_width_max,
|
||||
.RightExecutionMask = pipeline->cs_right_mask,
|
||||
.BottomExecutionMask = 0xffffffff);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_MEDIA_STATE_FLUSH);
|
||||
gen8_cmd_buffer_begin_subpass(cmd_buffer, subpass);
|
||||
}
|
||||
|
||||
void anv_CmdSetEvent(
|
||||
@@ -1139,131 +787,6 @@ void anv_CmdPushConstants(
|
||||
stub();
|
||||
}
|
||||
|
||||
static void
|
||||
anv_cmd_buffer_emit_depth_stencil(struct anv_cmd_buffer *cmd_buffer)
|
||||
{
|
||||
struct anv_subpass *subpass = cmd_buffer->state.subpass;
|
||||
struct anv_framebuffer *fb = cmd_buffer->state.framebuffer;
|
||||
const struct anv_depth_stencil_view *view;
|
||||
|
||||
static const struct anv_depth_stencil_view null_view =
|
||||
{ .depth_format = D16_UNORM, .depth_stride = 0, .stencil_stride = 0 };
|
||||
|
||||
if (subpass->depth_stencil_attachment != VK_ATTACHMENT_UNUSED) {
|
||||
const struct anv_attachment_view *aview =
|
||||
fb->attachments[subpass->depth_stencil_attachment];
|
||||
assert(aview->attachment_type == ANV_ATTACHMENT_VIEW_TYPE_DEPTH_STENCIL);
|
||||
view = (const struct anv_depth_stencil_view *)aview;
|
||||
} else {
|
||||
view = &null_view;
|
||||
}
|
||||
|
||||
/* FIXME: Implement the PMA stall W/A */
|
||||
/* FIXME: Width and Height are wrong */
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_DEPTH_BUFFER,
|
||||
.SurfaceType = SURFTYPE_2D,
|
||||
.DepthWriteEnable = view->depth_stride > 0,
|
||||
.StencilWriteEnable = view->stencil_stride > 0,
|
||||
.HierarchicalDepthBufferEnable = false,
|
||||
.SurfaceFormat = view->depth_format,
|
||||
.SurfacePitch = view->depth_stride > 0 ? view->depth_stride - 1 : 0,
|
||||
.SurfaceBaseAddress = { view->bo, view->depth_offset },
|
||||
.Height = cmd_buffer->state.framebuffer->height - 1,
|
||||
.Width = cmd_buffer->state.framebuffer->width - 1,
|
||||
.LOD = 0,
|
||||
.Depth = 1 - 1,
|
||||
.MinimumArrayElement = 0,
|
||||
.DepthBufferObjectControlState = GEN8_MOCS,
|
||||
.RenderTargetViewExtent = 1 - 1,
|
||||
.SurfaceQPitch = view->depth_qpitch >> 2);
|
||||
|
||||
/* Disable hierarchial depth buffers. */
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_HIER_DEPTH_BUFFER);
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_STENCIL_BUFFER,
|
||||
.StencilBufferEnable = view->stencil_stride > 0,
|
||||
.StencilBufferObjectControlState = GEN8_MOCS,
|
||||
.SurfacePitch = view->stencil_stride > 0 ? view->stencil_stride - 1 : 0,
|
||||
.SurfaceBaseAddress = { view->bo, view->stencil_offset },
|
||||
.SurfaceQPitch = view->stencil_qpitch >> 2);
|
||||
|
||||
/* Clear the clear params. */
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_CLEAR_PARAMS);
|
||||
}
|
||||
|
||||
void
|
||||
anv_cmd_buffer_begin_subpass(struct anv_cmd_buffer *cmd_buffer,
|
||||
struct anv_subpass *subpass)
|
||||
{
|
||||
cmd_buffer->state.subpass = subpass;
|
||||
|
||||
cmd_buffer->state.descriptors_dirty |= VK_SHADER_STAGE_FRAGMENT_BIT;
|
||||
|
||||
anv_cmd_buffer_emit_depth_stencil(cmd_buffer);
|
||||
}
|
||||
|
||||
void anv_CmdBeginRenderPass(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
const VkRenderPassBeginInfo* pRenderPassBegin,
|
||||
VkRenderPassContents contents)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
ANV_FROM_HANDLE(anv_render_pass, pass, pRenderPassBegin->renderPass);
|
||||
ANV_FROM_HANDLE(anv_framebuffer, framebuffer, pRenderPassBegin->framebuffer);
|
||||
|
||||
cmd_buffer->state.framebuffer = framebuffer;
|
||||
cmd_buffer->state.pass = pass;
|
||||
|
||||
const VkRect2D *render_area = &pRenderPassBegin->renderArea;
|
||||
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_DRAWING_RECTANGLE,
|
||||
.ClippedDrawingRectangleYMin = render_area->offset.y,
|
||||
.ClippedDrawingRectangleXMin = render_area->offset.x,
|
||||
.ClippedDrawingRectangleYMax =
|
||||
render_area->offset.y + render_area->extent.height - 1,
|
||||
.ClippedDrawingRectangleXMax =
|
||||
render_area->offset.x + render_area->extent.width - 1,
|
||||
.DrawingRectangleOriginY = 0,
|
||||
.DrawingRectangleOriginX = 0);
|
||||
|
||||
anv_cmd_buffer_clear_attachments(cmd_buffer, pass,
|
||||
pRenderPassBegin->pAttachmentClearValues);
|
||||
|
||||
anv_cmd_buffer_begin_subpass(cmd_buffer, pass->subpasses);
|
||||
}
|
||||
|
||||
void anv_CmdNextSubpass(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
VkRenderPassContents contents)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
|
||||
assert(cmd_buffer->level == VK_CMD_BUFFER_LEVEL_PRIMARY);
|
||||
|
||||
anv_cmd_buffer_begin_subpass(cmd_buffer, cmd_buffer->state.subpass + 1);
|
||||
}
|
||||
|
||||
void anv_CmdEndRenderPass(
|
||||
VkCmdBuffer cmdBuffer)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
|
||||
|
||||
/* Emit a flushing pipe control at the end of a pass. This is kind of a
|
||||
* hack but it ensures that render targets always actually get written.
|
||||
* Eventually, we should do flushing based on image format transitions
|
||||
* or something of that nature.
|
||||
*/
|
||||
anv_batch_emit(&cmd_buffer->batch, GEN8_PIPE_CONTROL,
|
||||
.PostSyncOperation = NoWrite,
|
||||
.RenderTargetCacheFlushEnable = true,
|
||||
.InstructionCacheInvalidateEnable = true,
|
||||
.DepthCacheFlushEnable = true,
|
||||
.VFCacheInvalidationEnable = true,
|
||||
.TextureCacheInvalidationEnable = true,
|
||||
.CommandStreamerStallEnable = true);
|
||||
}
|
||||
|
||||
void anv_CmdExecuteCommands(
|
||||
VkCmdBuffer cmdBuffer,
|
||||
uint32_t cmdBuffersCount,
|
||||
|
Reference in New Issue
Block a user