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

lavapipe: fail out if spirv->nir fails

Browse Source 
Just fail out earlier and assume a feature is missing.

Fixes a crash in validation layer tests

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9937>
This commit is contained in:
Dave Airlie
2021-03-31 10:25:13 +10:00
committed by Marge Bot
parent a17e10b109
commit d62bb8bc0d
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/frontends/lavapipe/lvp_pipeline.c
View File

@@ -485,6 +485,10 @@ lvp_shader_compile_to_ir(struct lvp_pipeline *pipeline,
spec_entries, num_spec_entries, spec_entries, num_spec_entries,
stage, entrypoint_name, &spirv_options, drv_options); stage, entrypoint_name, &spirv_options, drv_options);
if (!nir) {
free(spec_entries);
return;
}
nir_validate_shader(nir, NULL); nir_validate_shader(nir, NULL);
free(spec_entries); free(spec_entries);
@@ -753,6 +757,8 @@ lvp_graphics_pipeline_init(struct lvp_pipeline *pipeline,
pCreateInfo->pStages[i].pName, pCreateInfo->pStages[i].pName,
stage, stage,
pCreateInfo->pStages[i].pSpecializationInfo); pCreateInfo->pStages[i].pSpecializationInfo);
if (!pipeline->pipeline_nir[stage])
return VK_ERROR_FEATURE_NOT_PRESENT;
} }
if (pipeline->pipeline_nir[MESA_SHADER_FRAGMENT]) { if (pipeline->pipeline_nir[MESA_SHADER_FRAGMENT]) {
@@ -878,6 +884,8 @@ lvp_compute_pipeline_init(struct lvp_pipeline *pipeline,
pCreateInfo->stage.pName, pCreateInfo->stage.pName,
MESA_SHADER_COMPUTE, MESA_SHADER_COMPUTE,
pCreateInfo->stage.pSpecializationInfo); pCreateInfo->stage.pSpecializationInfo);
if (!pipeline->pipeline_nir[MESA_SHADER_COMPUTE])
return VK_ERROR_FEATURE_NOT_PRESENT;
lvp_pipeline_compile(pipeline, MESA_SHADER_COMPUTE); lvp_pipeline_compile(pipeline, MESA_SHADER_COMPUTE);
return VK_SUCCESS; return VK_SUCCESS;
} }