radv: don't require a GS copy shader to use the cache with NGG VS+GS

Fixes dEQP-VK.pipeline.cache.no_cache_control.readwrite_cache.pipeline_from_get_data.vertex_stage_geometry_stage_fragment_stage

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Fixes: 7e664a5383 ("radv: Don't generate GS copy shader when the pipeline has NGG.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12741>
This commit is contained in:
Rhys Perry
2021-09-06 18:21:46 +01:00
parent 2c21835963
commit 59084f05fc

View File

@@ -3376,7 +3376,8 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_device *device,
radv_create_shader_variants_from_pipeline_cache(device, cache, hash, pipeline->shaders,
stack_sizes, num_stack_sizes,
&found_in_application_cache) &&
(!modules[MESA_SHADER_GEOMETRY] || pipeline->gs_copy_shader)) {
(!modules[MESA_SHADER_GEOMETRY] || pipeline->gs_copy_shader ||
pipeline->shaders[MESA_SHADER_GEOMETRY]->info.is_ngg)) {
radv_stop_feedback(pipeline_feedback, found_in_application_cache);
return VK_SUCCESS;
}