KhronosGroup · pawel-jastrzebski-mobica · Oct 13, 2023 · Oct 17, 2023 · Nov 8, 2023 · Nov 14, 2023
diff --git a/framework/api_vulkan_sample.h b/framework/api_vulkan_sample.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Sascha Willems
+/* Copyright (c) 2019-2024, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -424,7 +424,7 @@ class ApiVulkanSample : public vkb::VulkanSample
 	std::string title = "Vulkan Example";
 	std::string name  = "vulkanExample";
 
-	struct
+	struct ImageData
 	{
 		VkImage        image;
 		VkDeviceMemory mem;

diff --git a/framework/gui.cpp b/framework/gui.cpp
@@ -1,5 +1,5 @@
-/* Copyright (c) 2018-2023, Arm Limited and Contributors
- * Copyright (c) 2019-2023, Sascha Willems
+/* Copyright (c) 2018-2024, Arm Limited and Contributors
+ * Copyright (c) 2019-2024, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -652,6 +652,11 @@ void Gui::draw(CommandBuffer &command_buffer)
 }
 
 void Gui::draw(VkCommandBuffer command_buffer)
+{
+	draw(command_buffer, pipeline, pipeline_layout->get_handle(), descriptor_set);
+}
+
+void Gui::draw(VkCommandBuffer command_buffer, const VkPipeline pipeline, const VkPipelineLayout pipeline_layout, const VkDescriptorSet descriptor_set)
 {
 	if (!visible)
 	{
@@ -669,13 +674,13 @@ void Gui::draw(VkCommandBuffer command_buffer)
 	}
 
 	vkCmdBindPipeline(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
-	vkCmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline_layout->get_handle(), 0, 1, &descriptor_set, 0, NULL);
+	vkCmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline_layout, 0, 1, &descriptor_set, 0, NULL);
 
 	// Push constants
 	auto push_transform = glm::mat4(1.0f);
 	push_transform      = glm::translate(push_transform, glm::vec3(-1.0f, -1.0f, 0.0f));
 	push_transform      = glm::scale(push_transform, glm::vec3(2.0f / io.DisplaySize.x, 2.0f / io.DisplaySize.y, 0.0f));
-	vkCmdPushConstants(command_buffer, pipeline_layout->get_handle(), VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(glm::mat4), &push_transform);
+	vkCmdPushConstants(command_buffer, pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(glm::mat4), &push_transform);
 
 	VkDeviceSize offsets[1] = {0};
 
@@ -729,6 +734,16 @@ Drawer &Gui::get_drawer()
 	return drawer;
 }
 
+VkSampler Gui::get_sampler() const
+{
+	return sampler->get_handle();
+}
+
+VkImageView Gui::get_font_image_view() const
+{
+	return font_image_view->get_handle();
+}
+
 Font &Gui::get_font(const std::string &font_name)
 {
 	assert(!fonts.empty() && "No fonts exist");

diff --git a/framework/gui.h b/framework/gui.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2018-2023, Arm Limited and Contributors
- * Copyright (c) 2019-2023, Sascha Willems
+/* Copyright (c) 2018-2024, Arm Limited and Contributors
+ * Copyright (c) 2019-2024, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -349,6 +349,15 @@ class Gui
 	 */
 	void draw(VkCommandBuffer command_buffer);
 
+	/**
+	 * @brief Draws the Gui using an external pipeline
+	 * @param command_buffer Command buffer to register draw-commands
+	 * @param pipeline Pipeline to bind to perform draw-commands
+	 * @param pipeline_layout PipelineLayout for given pieline
+	 * @param descriptor_set DescriptorSet to bind to perform draw-commands
+	 */
+	void draw(VkCommandBuffer command_buffer, const VkPipeline pipeline, const VkPipelineLayout pipeline_layout, const VkDescriptorSet descriptor_set);
+
 	/**
 	 * @brief Shows an overlay top window with app info and maybe stats
 	 * @param app_name Application name
@@ -407,6 +416,10 @@ class Gui
 
 	void set_subpass(const uint32_t subpass);
 
+	VkSampler get_sampler() const;
+
+	VkImageView get_font_image_view() const;
+
   private:
 	/**
 	 * @brief Block size of a buffer pool in kilobytes

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, Arm Limited and Contributors
+# Copyright (c) 2019-2024, Arm Limited and Contributors
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -87,6 +87,7 @@ set(ORDER_LIST
     "fragment_shader_barycentric"
     "gshader_to_mshader"
     "color_write_enable"
+    "dynamic_multisample_rasterization"
     "sparse_image"
 
     #Performance Samples

diff --git a/samples/extensions/dynamic_multisample_rasterization/CMakeLists.txt b/samples/extensions/dynamic_multisample_rasterization/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Copyright (c) 2024, Mobica Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 the "License";
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+get_filename_component(FOLDER_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
+get_filename_component(PARENT_DIR ${CMAKE_CURRENT_LIST_DIR} PATH)
+get_filename_component(CATEGORY_NAME ${PARENT_DIR} NAME)
+
+add_sample(
+    ID ${FOLDER_NAME}
+    CATEGORY ${CATEGORY_NAME}
+    AUTHOR "Mobica"
+    NAME "Extended Dynamic State3 Multisample Rasterization"
+    DESCRIPTION "Sample description"
+    SHADER_FILES_GLSL
+        "dynamic_multisample_rasterization/model.vert"
+        "dynamic_multisample_rasterization/model.frag")
diff --git a/samples/extensions/dynamic_multisample_rasterization/README.adoc b/samples/extensions/dynamic_multisample_rasterization/README.adoc
@@ -0,0 +1,55 @@
+////
+- Copyright (c) 2024, Mobica Limited
+-
+- SPDX-License-Identifier: Apache-2.0
+-
+- Licensed under the Apache License, Version 2.0 the "License";
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+-     http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+-
+////
+
+// Extended dynamic_state3: Rasterization samples
+
+
+== Overview
+
+This sample demonstrates one of the functionalities of VK_EXT_extended_dynamic_state3 related to rasterization samples.
+The extension can be used to dynamically change sampling without need to swap pipelines.
+image:image/image.png[]
+
+== Enabling the extension
+
+To be able to use this extension in Vulkan API:
+`VK_EXT_extended_dynamic_state3` depends on `VK_KHR_get_physical_device_properties2`, which is promoted to Vulkan 1.1. That is, to use this extension, `VK_EXT_extended_dynamic_state3` and either `VK_KHR_get_physical_device_properties2` or Vulkan 1.1 are required.
+
+== Using the extension
+
+To use the extension:
+1) `VK_DYNAMIC_STATE_RASTERIZATION_SAMPLES_EXT` must be added to `VkPipelineDynamicStateCreateInfo`.
+2) Method `void vkCmdSetRasterizationSamplesEXT(VkCommandBuffer commandBuffer, VkSampleCountFlagBits rasterizationSamples)` should be called between `vkCmdBeginRenderPass` and `vkCmdEndRenderPass`.
+
+== Known issues
+
+The extension always reports the following validation errors when enabled:
+....
+VUID-vkCmdDraw-rasterizationSamples-07474(ERROR / SPEC): msgNum: -2007336333 - Validation Error: [ VUID-vkCmdDraw-rasterizationSamples-07474 ] Object 0: handle = 0x1ab5b866f50, type = VK_OBJECT_TYPE_COMMAND_BUFFER; | MessageID = 0x885a7a73 | vkCmdDraw():  Render pass attachment 1 samples VK_SAMPLE_COUNT_1_BIT does not match samples VK_SAMPLE_COUNT_4_BIT set with vkCmdSetRasterizationSamplesEXT(). The Vulkan spec states: If the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_RASTERIZATION_SAMPLES_EXT state enabled, and neither the VK_AMD_mixed_attachment_samples nor the VK_NV_framebuffer_mixed_samples extensions are enabled, then the rasterizationSamples in the last call to vkCmdSetRasterizationSamplesEXT must be the same as the current subpass color and/or depth/stencil attachments (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-vkCmdDraw-rasterizationSamples-07474)
+VUID-vkCmdDraw-renderPass-02684: Validation Error: [ VUID-vkCmdDraw-renderPass-02684 ] Object 0: handle = 0x7533b600000006c9, type = VK_OBJECT_TYPE_RENDER_PASS; Object 1: handle = 0x30f5a50000000020, type = VK_OBJECT_TYPE_RENDER_PASS; | MessageID = 0x50685725 | vkCmdDraw():  RenderPasses incompatible between active render pass w/ VkRenderPass 0x7533b600000006c9[] and pipeline state object w/ VkRenderPass 0x30f5a50000000020[] Attachment 0 is not compatible with 0: They have different samples.. The Vulkan spec states: The current render pass must be compatible with the renderPass member of the VkGraphicsPipelineCreateInfo structure specified when creating the VkPipeline bound to VK_PIPELINE_BIND_POINT_GRAPHICS (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-vkCmdDraw-renderPass-02684)
+....
+
+The root cause for the validation errors is currently unknown and under analysis by Vulkan Validation Layers team:
+
+https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/7327
+
+== Resources
+
+https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_extended_dynamic_state3.html
+https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdSetRasterizationSamplesEXT.html