radv: emit framebuffer state from primary if secondary doesn't inherit it
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Thu, 13 Jun 2019 11:56:22 +0000 (13:56 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Fri, 21 Jun 2019 11:49:35 +0000 (13:49 +0200)
Otherwise fast color/depth clears can't work because they depend
on the framebuffer.

This fixes the following CTS (when the small hint is disabled):
- dEQP-VK.geometry.layered.1d_array.secondary_cmd_buffer
- dEQP-VK.geometry.layered.2d_array.secondary_cmd_buffer
- dEQP-VK.geometry.layered.cube.secondary_cmd_buffer
- dEQP-VK.geometry.layered.cube_array.secondary_cmd_buffer

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110810
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107986
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/vulkan/radv_cmd_buffer.c

index f311b978b30a22220010beb5bc78a4e410252c57..bf2ecc4b0b46b934e2a2de7f763f955789d38acd 100644 (file)
@@ -3724,6 +3724,15 @@ void radv_CmdExecuteCommands(
                if (secondary->sample_positions_needed)
                        primary->sample_positions_needed = true;
 
+               if (!secondary->state.framebuffer &&
+                   (primary->state.dirty & RADV_CMD_DIRTY_FRAMEBUFFER)) {
+                       /* Emit the framebuffer state from primary if secondary
+                        * has been recorded without a framebuffer, otherwise
+                        * fast color/depth clears can't work.
+                        */
+                       radv_emit_framebuffer_state(primary);
+               }
+
                primary->device->ws->cs_execute_secondary(primary->cs, secondary->cs);