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

vk/gen8: Don't duplicate generic pipeline setup

Browse Source 
gen8_graphics_pipeline_create had a bunch of stuff in it that's already set
up by anv_pipeline_init.  The duplication was causing double-initialization
of a state stream and made valgrind very angry.
This commit is contained in:
Jason Ekstrand
2015-08-25 18:32:56 -07:00
parent 9b387b5d3f
commit 4bb9915755
2 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vulkan/anv_pipeline.c
View File

@@ -189,10 +189,11 @@ anv_pipeline_init(struct anv_pipeline *pipeline, struct anv_device *device,
const VkGraphicsPipelineCreateInfo *pCreateInfo, const VkGraphicsPipelineCreateInfo *pCreateInfo,
const struct anv_graphics_pipeline_create_info *extra) const struct anv_graphics_pipeline_create_info *extra)
{ {
VkResult result;
pipeline->device = device; pipeline->device = device;
pipeline->layout = anv_pipeline_layout_from_handle(pCreateInfo->layout); pipeline->layout = anv_pipeline_layout_from_handle(pCreateInfo->layout);
memset(pipeline->shaders, 0, sizeof(pipeline->shaders)); memset(pipeline->shaders, 0, sizeof(pipeline->shaders));
VkResult result;
result = anv_reloc_list_init(&pipeline->batch_relocs, device); result = anv_reloc_list_init(&pipeline->batch_relocs, device);
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {

32
src/vulkan/gen8_pipeline.c
View File

@@ -312,38 +312,6 @@ gen8_graphics_pipeline_create(
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
pipeline->device = device;
pipeline->layout = anv_pipeline_layout_from_handle(pCreateInfo->layout);
memset(pipeline->shaders, 0, sizeof(pipeline->shaders));
result = anv_reloc_list_init(&pipeline->batch_relocs, device);
if (result != VK_SUCCESS) {
anv_device_free(device, pipeline);
return result;
}
pipeline->batch.next = pipeline->batch.start = pipeline->batch_data;
pipeline->batch.end = pipeline->batch.start + sizeof(pipeline->batch_data);
pipeline->batch.relocs = &pipeline->batch_relocs;
anv_state_stream_init(&pipeline->program_stream,
&device->instruction_block_pool);
for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) {
pipeline->shaders[pCreateInfo->pStages[i].stage] =
anv_shader_from_handle(pCreateInfo->pStages[i].shader);
}
if (pCreateInfo->pTessellationState)
anv_finishme("VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO");
if (pCreateInfo->pViewportState)
anv_finishme("VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO");
if (pCreateInfo->pMultisampleState)
anv_finishme("VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO");
pipeline->use_repclear = extra && extra->use_repclear;
anv_compiler_run(device->compiler, pipeline);
/* FIXME: The compiler dead-codes FS inputs when we don't have a VS, so we /* FIXME: The compiler dead-codes FS inputs when we don't have a VS, so we
* hard code this to num_attributes - 2. This is because the attributes * hard code this to num_attributes - 2. This is because the attributes
* include VUE header and position, which aren't counted as varying * include VUE header and position, which aren't counted as varying