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

anv/genX_pipeline: 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:29:42 -07:00
parent a48f8340d9
commit dba3727bea
2 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/intel/vulkan/genX_pipeline.c
View File

@@ -105,23 +105,24 @@ genX(compute_pipeline_create)(
const uint32_t vfe_curbe_allocation = const uint32_t vfe_curbe_allocation =
push_constant_regs * pipeline->cs_thread_width_max; push_constant_regs * pipeline->cs_thread_width_max;
anv_batch_emit(&pipeline->batch, GENX(MEDIA_VFE_STATE), anv_batch_emit_blk(&pipeline->batch, GENX(MEDIA_VFE_STATE), vfe) {
.ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_COMPUTE], vfe.ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_COMPUTE];
.PerThreadScratchSpace = ffs(cs_prog_data->base.total_scratch / 2048), vfe.PerThreadScratchSpace = ffs(cs_prog_data->base.total_scratch / 2048);
#if GEN_GEN > 7 #if GEN_GEN > 7
.ScratchSpaceBasePointerHigh = 0, vfe.ScratchSpaceBasePointerHigh = 0;
.StackSize = 0, vfe.StackSize = 0;
#else #else
.GPGPUMode = true, vfe.GPGPUMode = true;
#endif #endif
.MaximumNumberofThreads = device->info.max_cs_threads - 1, vfe.MaximumNumberofThreads = device->info.max_cs_threads - 1;
.NumberofURBEntries = GEN_GEN <= 7 ? 0 : 2, vfe.NumberofURBEntries = GEN_GEN <= 7 ? 0 : 2;
.ResetGatewayTimer = true, vfe.ResetGatewayTimer = true;
#if GEN_GEN <= 8 #if GEN_GEN <= 8
.BypassGatewayControl = true, vfe.BypassGatewayControl = true;
#endif #endif
.URBEntryAllocationSize = GEN_GEN <= 7 ? 0 : 2, vfe.URBEntryAllocationSize = GEN_GEN <= 7 ? 0 : 2;
.CURBEAllocationSize = vfe_curbe_allocation); vfe.CURBEAllocationSize = vfe_curbe_allocation;
}
*pPipeline = anv_pipeline_to_handle(pipeline); *pPipeline = anv_pipeline_to_handle(pipeline);

58
src/intel/vulkan/genX_pipeline_util.h
View File

@@ -130,12 +130,13 @@ emit_vertex_input(struct anv_pipeline *pipeline,
* that controls instancing. On Haswell and prior, that's part of * that controls instancing. On Haswell and prior, that's part of
* VERTEX_BUFFER_STATE which we emit later. * VERTEX_BUFFER_STATE which we emit later.
*/ */
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VF_INSTANCING), anv_batch_emit_blk(&pipeline->batch, GENX(3DSTATE_VF_INSTANCING), vfi) {
.InstancingEnable = pipeline->instancing_enable[desc->binding], vfi.InstancingEnable = pipeline->instancing_enable[desc->binding],
.VertexElementIndex = slot, vfi.VertexElementIndex = slot,
/* Vulkan so far doesn't have an instance divisor, so /* Vulkan so far doesn't have an instance divisor, so
* this is always 1 (ignored if not instancing). */ * this is always 1 (ignored if not instancing). */
.InstanceDataStepRate = 1); vfi.InstanceDataStepRate = 1;
}
#endif #endif
} }
@@ -172,13 +173,14 @@ emit_vertex_input(struct anv_pipeline *pipeline,
} }
#if GEN_GEN >= 8 #if GEN_GEN >= 8
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VF_SGVS), anv_batch_emit_blk(&pipeline->batch, GENX(3DSTATE_VF_SGVS), sgvs) {
.VertexIDEnable = vs_prog_data->uses_vertexid, sgvs.VertexIDEnable = vs_prog_data->uses_vertexid;
.VertexIDComponentNumber = 2, sgvs.VertexIDComponentNumber = 2;
.VertexIDElementOffset = id_slot, sgvs.VertexIDElementOffset = id_slot;
.InstanceIDEnable = vs_prog_data->uses_instanceid, sgvs.InstanceIDEnable = vs_prog_data->uses_instanceid;
.InstanceIDComponentNumber = 3, sgvs.InstanceIDComponentNumber = 3;
.InstanceIDElementOffset = id_slot); sgvs.InstanceIDElementOffset = id_slot;
}
#endif #endif
} }
@@ -196,28 +198,32 @@ emit_urb_setup(struct anv_pipeline *pipeline)
* 3DSTATE_SAMPLER_STATE_POINTER_VS command. Only one PIPE_CONTROL * 3DSTATE_SAMPLER_STATE_POINTER_VS command. Only one PIPE_CONTROL
* needs to be sent before any combination of VS associated 3DSTATE." * needs to be sent before any combination of VS associated 3DSTATE."
*/ */
anv_batch_emit(&pipeline->batch, GEN7_PIPE_CONTROL, anv_batch_emit_blk(&pipeline->batch, GEN7_PIPE_CONTROL, pc) {
.DepthStallEnable = true, pc.DepthStallEnable = true;
.PostSyncOperation = WriteImmediateData, pc.PostSyncOperation = WriteImmediateData;
.Address = { &device->workaround_bo, 0 }); pc.Address = (struct anv_address) { &device->workaround_bo, 0 };
}
#endif #endif
unsigned push_start = 0; unsigned push_start = 0;
for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_FRAGMENT; i++) { for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_FRAGMENT; i++) {
unsigned push_size = pipeline->urb.push_size[i]; unsigned push_size = pipeline->urb.push_size[i];
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_PUSH_CONSTANT_ALLOC_VS), anv_batch_emit_blk(&pipeline->batch,
._3DCommandSubOpcode = 18 + i, GENX(3DSTATE_PUSH_CONSTANT_ALLOC_VS), alloc) {
.ConstantBufferOffset = (push_size > 0) ? push_start : 0, alloc._3DCommandSubOpcode = 18 + i;
.ConstantBufferSize = push_size); alloc.ConstantBufferOffset = (push_size > 0) ? push_start : 0;
alloc.ConstantBufferSize = push_size;
}
push_start += pipeline->urb.push_size[i]; push_start += pipeline->urb.push_size[i];
} }
for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_GEOMETRY; i++) { for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_GEOMETRY; i++) {
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_URB_VS), anv_batch_emit_blk(&pipeline->batch, GENX(3DSTATE_URB_VS), urb) {
._3DCommandSubOpcode = 48 + i, urb._3DCommandSubOpcode = 48 + i;
.VSURBStartingAddress = pipeline->urb.start[i], urb.VSURBStartingAddress = pipeline->urb.start[i];
.VSURBEntryAllocationSize = pipeline->urb.size[i] - 1, urb.VSURBEntryAllocationSize = pipeline->urb.size[i] - 1;
.VSNumberofURBEntries = pipeline->urb.entries[i]); urb.VSNumberofURBEntries = pipeline->urb.entries[i];
}
} }
} }