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

radv/meta: stop checking that creating NIR shaders failed

Browse Source 
This shouldn't happen in practice.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30262>
This commit is contained in:
Samuel Pitoiset
2024-07-19 09:44:55 +02:00
committed by Marge Bot
parent 508a3bdd27
commit c96f2c5e3d
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/amd/vulkan/meta/radv_meta_decompress.c
View File

@@ -99,12 +99,6 @@ create_pipeline_gfx(struct radv_device *device, uint32_t samples, VkPipelineLayo
nir_shader *vs_module = radv_meta_build_nir_vs_generate_vertices(device);
nir_shader *fs_module = radv_meta_build_nir_fs_noop(device);
if (!vs_module || !fs_module) {
/* XXX: Need more accurate error */
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto cleanup;
}
const VkPipelineSampleLocationsStateCreateInfoEXT sample_locs_create_info = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT,
.sampleLocationsEnable = false,
@@ -212,7 +206,6 @@ create_pipeline_gfx(struct radv_device *device, uint32_t samples, VkPipelineLayo
result = radv_graphics_pipeline_create(device_h, device->meta_state.cache, &pipeline_create_info, &extra,
&device->meta_state.alloc, pipeline);
cleanup:
ralloc_free(fs_module);
ralloc_free(vs_module);
return result;

11
src/amd/vulkan/meta/radv_meta_fast_clear.c
View File

@@ -125,12 +125,6 @@ create_pipeline(struct radv_device *device, VkShaderModule vs_module_h, VkPipeli
nir_shader *fs_module = radv_meta_build_nir_fs_noop(device);
if (!fs_module) {
/* XXX: Need more accurate error */
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto cleanup;
}
const VkPipelineShaderStageCreateInfo stages[2] = {
{
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
@@ -371,11 +365,6 @@ radv_device_init_meta_fast_clear_flush_state_internal(struct radv_device *device
}
nir_shader *vs_module = radv_meta_build_nir_vs_generate_vertices(device);
if (!vs_module) {
/* XXX: Need more accurate error */
res = VK_ERROR_OUT_OF_HOST_MEMORY;
goto cleanup;
}
res = radv_meta_create_pipeline_layout(device, NULL, 0, NULL, &device->meta_state.fast_clear_flush.p_layout);
if (res != VK_SUCCESS)

5
src/amd/vulkan/meta/radv_meta_resolve.c
View File

@@ -36,11 +36,6 @@ create_pipeline(struct radv_device *device, VkFormat format, VkPipeline *pipelin
nir_shader *vs_module = radv_meta_build_nir_vs_generate_vertices(device);
nir_shader *fs_module = build_nir_fs(device);
if (!vs_module || !fs_module) {
/* XXX: Need more accurate error */
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto cleanup;
}
if (!device->meta_state.resolve.p_layout) {
result = radv_meta_create_pipeline_layout(device, NULL, 0, NULL, &device->meta_state.resolve.p_layout);