KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anv/meta_resolve: Remove redundant initialization params

This commit is contained in:
Chad Versace 2016-01-28 10:14:39 -08:00
parent 142da00486
commit ac5594fa71
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/vulkan/anv_meta_resolve.c
View File

@ -164,7 +164,7 @@ build_nir_fs(uint32_t num_samples)
} }
static VkResult static VkResult
create_pass(struct anv_device *device, VkRenderPass *pass_h) create_pass(struct anv_device *device)
{ {
VkResult result; VkResult result;
VkDevice device_h = anv_device_to_handle(device); VkDevice device_h = anv_device_to_handle(device);
@ -201,7 +201,7 @@ create_pass(struct anv_device *device, VkRenderPass *pass_h)
.dependencyCount = 0, .dependencyCount = 0,
}, },
alloc, alloc,
pass_h); &device->meta_state.resolve.pass);
return result; return result;
} }
@ -209,12 +209,11 @@ create_pass(struct anv_device *device, VkRenderPass *pass_h)
static VkResult static VkResult
create_pipeline(struct anv_device *device, create_pipeline(struct anv_device *device,
uint32_t num_samples, uint32_t num_samples,
VkShaderModule vs_module_h, VkShaderModule vs_module_h)
VkRenderPass pass_h,
VkPipeline *pipeline_h)
{ {
VkResult result; VkResult result;
VkDevice device_h = anv_device_to_handle(device); VkDevice device_h = anv_device_to_handle(device);
uint32_t samples_log2 = ffs(num_samples) - 1;
struct anv_shader_module fs_module = { struct anv_shader_module fs_module = {
.nir = build_nir_fs(num_samples), .nir = build_nir_fs(num_samples),
@ -223,7 +222,7 @@ create_pipeline(struct anv_device *device,
if (!fs_module.nir) { if (!fs_module.nir) {
/* XXX: Need more accurate error */ /* XXX: Need more accurate error */
result = VK_ERROR_OUT_OF_HOST_MEMORY; result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto fail; goto cleanup;
} }
result = anv_graphics_pipeline_create(device_h, result = anv_graphics_pipeline_create(device_h,
@ -328,7 +327,7 @@ create_pipeline(struct anv_device *device,
}, },
}, },
.layout = device->meta_state.resolve.pipeline_layout, .layout = device->meta_state.resolve.pipeline_layout,
.renderPass = pass_h, .renderPass = device->meta_state.resolve.pass,
.subpass = 0, .subpass = 0,
}, },
&(struct anv_graphics_pipeline_create_info) { &(struct anv_graphics_pipeline_create_info) {
@ -340,15 +339,12 @@ create_pipeline(struct anv_device *device,
.use_rectlist = true .use_rectlist = true
}, },
&device->meta_state.alloc, &device->meta_state.alloc,
pipeline_h); &device->meta_state.resolve.pipelines[samples_log2]);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
goto fail; goto cleanup;
goto cleanup; goto cleanup;
fail:
*pipeline_h = VK_NULL_HANDLE;
cleanup: cleanup:
ralloc_free(fs_module.nir); ralloc_free(fs_module.nir);
return result; return result;
@ -435,12 +431,10 @@ anv_device_init_meta_resolve_state(struct anv_device *device)
if (res != VK_SUCCESS) if (res != VK_SUCCESS)
goto fail; goto fail;
res = create_pass(device);
res = create_pass(device, &device->meta_state.resolve.pass);
if (res != VK_SUCCESS) if (res != VK_SUCCESS)
goto fail; goto fail;
for (uint32_t i = 0; for (uint32_t i = 0;
i < ARRAY_SIZE(device->meta_state.resolve.pipelines); ++i) { i < ARRAY_SIZE(device->meta_state.resolve.pipelines); ++i) {
uint32_t sample_count = 1 << i; uint32_t sample_count = 1 << i;
@ -448,9 +442,7 @@ anv_device_init_meta_resolve_state(struct anv_device *device)
if (!(sample_count_mask & sample_count)) if (!(sample_count_mask & sample_count))
continue; continue;
res = create_pipeline(device, sample_count, vs_module_h, res = create_pipeline(device, sample_count, vs_module_h);
device->meta_state.resolve.pass,
&device->meta_state.resolve.pipelines[i]);
if (res != VK_SUCCESS) if (res != VK_SUCCESS)
goto fail; goto fail;
} }