diff --git a/AndroidGen.mk b/AndroidGen.mk
index 161247c..ae098e1 100644
--- a/AndroidGen.mk
+++ b/AndroidGen.mk
@@ -157,6 +157,7 @@
 	external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp \
 	external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp \
 	external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCBTests.cpp \
+	external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateClearTests.cpp \
 	external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateComputeTests.cpp \
 	external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp \
 	external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateGeneralTests.cpp \
diff --git a/android/cts/main/vk-master-2022-03-01/dynamic-state.txt b/android/cts/main/vk-master-2022-03-01/dynamic-state.txt
index 39894f0..fee8f44 100644
--- a/android/cts/main/vk-master-2022-03-01/dynamic-state.txt
+++ b/android/cts/main/vk-master-2022-03-01/dynamic-state.txt
@@ -21,8 +21,16 @@
 dEQP-VK.dynamic_state.pipeline_library.inheritance.split
 dEQP-VK.dynamic_state.pipeline_library.inheritance.primary_with_count
 dEQP-VK.dynamic_state.pipeline_library.inheritance.secondary_with_count
+dEQP-VK.dynamic_state.pipeline_library.image.clear
+dEQP-VK.dynamic_state.pipeline_library.image.blit
+dEQP-VK.dynamic_state.pipeline_library.image.copy
+dEQP-VK.dynamic_state.pipeline_library.image.resolve
 dEQP-VK.dynamic_state.monolithic.rs_state.nonzero_depth_bias_constant
 dEQP-VK.dynamic_state.monolithic.rs_state.nonzero_depth_bias_clamp
+dEQP-VK.dynamic_state.monolithic.image.clear
+dEQP-VK.dynamic_state.monolithic.image.blit
+dEQP-VK.dynamic_state.monolithic.image.copy
+dEQP-VK.dynamic_state.monolithic.image.resolve
 dEQP-VK.dynamic_state.fast_linked_library.vp_state.viewport
 dEQP-VK.dynamic_state.fast_linked_library.vp_state.scissor
 dEQP-VK.dynamic_state.fast_linked_library.vp_state.viewport_array
@@ -46,3 +54,7 @@
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.split
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.primary_with_count
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.secondary_with_count
+dEQP-VK.dynamic_state.fast_linked_library.image.clear
+dEQP-VK.dynamic_state.fast_linked_library.image.blit
+dEQP-VK.dynamic_state.fast_linked_library.image.copy
+dEQP-VK.dynamic_state.fast_linked_library.image.resolve
diff --git a/android/cts/main/vk-master/dynamic-state.txt b/android/cts/main/vk-master/dynamic-state.txt
index 5163711..1a9bc2a 100644
--- a/android/cts/main/vk-master/dynamic-state.txt
+++ b/android/cts/main/vk-master/dynamic-state.txt
@@ -21,6 +21,10 @@
 dEQP-VK.dynamic_state.pipeline_library.inheritance.split
 dEQP-VK.dynamic_state.pipeline_library.inheritance.primary_with_count
 dEQP-VK.dynamic_state.pipeline_library.inheritance.secondary_with_count
+dEQP-VK.dynamic_state.pipeline_library.image.clear
+dEQP-VK.dynamic_state.pipeline_library.image.blit
+dEQP-VK.dynamic_state.pipeline_library.image.copy
+dEQP-VK.dynamic_state.pipeline_library.image.resolve
 dEQP-VK.dynamic_state.monolithic.vp_state.viewport
 dEQP-VK.dynamic_state.monolithic.vp_state.scissor
 dEQP-VK.dynamic_state.monolithic.vp_state.viewport_array
@@ -44,6 +48,10 @@
 dEQP-VK.dynamic_state.monolithic.inheritance.split
 dEQP-VK.dynamic_state.monolithic.inheritance.primary_with_count
 dEQP-VK.dynamic_state.monolithic.inheritance.secondary_with_count
+dEQP-VK.dynamic_state.monolithic.image.clear
+dEQP-VK.dynamic_state.monolithic.image.blit
+dEQP-VK.dynamic_state.monolithic.image.copy
+dEQP-VK.dynamic_state.monolithic.image.resolve
 dEQP-VK.dynamic_state.monolithic.compute_transfer.single.compute.viewport.before
 dEQP-VK.dynamic_state.monolithic.compute_transfer.single.compute.viewport.after
 dEQP-VK.dynamic_state.monolithic.compute_transfer.single.compute.scissor.before
@@ -191,3 +199,7 @@
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.split
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.primary_with_count
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.secondary_with_count
+dEQP-VK.dynamic_state.fast_linked_library.image.clear
+dEQP-VK.dynamic_state.fast_linked_library.image.blit
+dEQP-VK.dynamic_state.fast_linked_library.image.copy
+dEQP-VK.dynamic_state.fast_linked_library.image.resolve
diff --git a/android/cts/main/vksc-main/dynamic-state.txt b/android/cts/main/vksc-main/dynamic-state.txt
index f4ddbf6..0fd4e32 100644
--- a/android/cts/main/vksc-main/dynamic-state.txt
+++ b/android/cts/main/vksc-main/dynamic-state.txt
@@ -14,6 +14,10 @@
 dEQP-VKSC.dynamic_state.pipeline_library.general_state.bind_order
 dEQP-VKSC.dynamic_state.pipeline_library.general_state.state_persistence
 dEQP-VKSC.dynamic_state.pipeline_library.inheritance.baseline
+dEQP-VKSC.dynamic_state.pipeline_library.image.clear
+dEQP-VKSC.dynamic_state.pipeline_library.image.blit
+dEQP-VKSC.dynamic_state.pipeline_library.image.copy
+dEQP-VKSC.dynamic_state.pipeline_library.image.resolve
 dEQP-VKSC.dynamic_state.monolithic.vp_state.viewport
 dEQP-VKSC.dynamic_state.monolithic.vp_state.scissor
 dEQP-VKSC.dynamic_state.monolithic.vp_state.viewport_array
@@ -30,6 +34,10 @@
 dEQP-VKSC.dynamic_state.monolithic.general_state.bind_order
 dEQP-VKSC.dynamic_state.monolithic.general_state.state_persistence
 dEQP-VKSC.dynamic_state.monolithic.inheritance.baseline
+dEQP-VKSC.dynamic_state.monolithic.image.clear
+dEQP-VKSC.dynamic_state.monolithic.image.blit
+dEQP-VKSC.dynamic_state.monolithic.image.copy
+dEQP-VKSC.dynamic_state.monolithic.image.resolve
 dEQP-VKSC.dynamic_state.monolithic.compute_transfer.single.compute.viewport.before
 dEQP-VKSC.dynamic_state.monolithic.compute_transfer.single.compute.viewport.after
 dEQP-VKSC.dynamic_state.monolithic.compute_transfer.single.compute.scissor.before
@@ -150,3 +158,7 @@
 dEQP-VKSC.dynamic_state.fast_linked_library.general_state.bind_order
 dEQP-VKSC.dynamic_state.fast_linked_library.general_state.state_persistence
 dEQP-VKSC.dynamic_state.fast_linked_library.inheritance.baseline
+dEQP-VKSC.dynamic_state.fast_linked_library.image.clear
+dEQP-VKSC.dynamic_state.fast_linked_library.image.blit
+dEQP-VKSC.dynamic_state.fast_linked_library.image.copy
+dEQP-VKSC.dynamic_state.fast_linked_library.image.resolve
diff --git a/external/vulkancts/modules/vulkan/dynamic_state/CMakeLists.txt b/external/vulkancts/modules/vulkan/dynamic_state/CMakeLists.txt
index af6c2e4..73f86e2 100644
--- a/external/vulkancts/modules/vulkan/dynamic_state/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/dynamic_state/CMakeLists.txt
@@ -11,6 +11,8 @@
 	vktDynamicStateBaseClass.cpp
 	vktDynamicStateCBTests.cpp
 	vktDynamicStateCBTests.hpp
+	vktDynamicStateClearTests.cpp
+	vktDynamicStateClearTests.hpp
 	vktDynamicStateComputeTests.cpp
 	vktDynamicStateComputeTests.hpp
 	vktDynamicStateDSTests.cpp
diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp
index 312a645..a31dbba 100644
--- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp
+++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp
@@ -167,11 +167,11 @@
 
 void DynamicStateBaseClass::initPipeline (const vk::VkDevice device)
 {
-	const PipelineCreateInfo::ColorBlendState::Attachment	attachmentState;
-	const PipelineCreateInfo::ColorBlendState				colorBlendState(1, &attachmentState);
+	const PipelineCreateInfo::ColorBlendState				colorBlendState(1, &m_attachmentState);
 	const PipelineCreateInfo::RasterizerState				rasterizerState;
-	const PipelineCreateInfo::DepthStencilState				depthStencilState;
+	const PipelineCreateInfo::DepthStencilState             depthStencilState;
 	const PipelineCreateInfo::DynamicState					dynamicState;
+	const PipelineCreateInfo::MultiSampleState				multisampleState;
 
 	const vk::Unique<vk::VkShaderModule>	vs			(createShaderModule(m_vk, device, m_context.getBinaryCollection().get(m_vertexShaderName), 0));
 	const vk::Unique<vk::VkShaderModule>	fs			(createShaderModule(m_vk, device, m_context.getBinaryCollection().get(m_fragmentShaderName), 0));
@@ -180,7 +180,6 @@
 
 	m_pipeline.setDefaultTopology(m_topology)
 			  .setDynamicState(static_cast<const vk::VkPipelineDynamicStateCreateInfo*>(&dynamicState))
-			  .setDefaultMultisampleState()
 			  .setupVertexInputStete(&m_vertexInputState)
 			  .setupPreRasterizationShaderState(viewports,
 												scissors,
@@ -189,8 +188,8 @@
 												0u,
 												*vs,
 												static_cast<const vk::VkPipelineRasterizationStateCreateInfo*>(&rasterizerState))
-			  .setupFragmentShaderState(*m_pipelineLayout, *m_renderPass, 0u, *fs, static_cast<const vk::VkPipelineDepthStencilStateCreateInfo*>(&depthStencilState))
-			  .setupFragmentOutputState(*m_renderPass, 0u, static_cast<const vk::VkPipelineColorBlendStateCreateInfo*>(&colorBlendState))
+			  .setupFragmentShaderState(*m_pipelineLayout, *m_renderPass, 0u, *fs, static_cast<const vk::VkPipelineDepthStencilStateCreateInfo*>(&depthStencilState), &multisampleState)
+			  .setupFragmentOutputState(*m_renderPass, 0u, static_cast<const vk::VkPipelineColorBlendStateCreateInfo*>(&colorBlendState), &multisampleState)
 			  .setMonolithicPipelineLayout(*m_pipelineLayout)
 			  .buildPipeline();
 }
diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.hpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.hpp
index 1804219..de0b176 100644
--- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.hpp
+++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.hpp
@@ -87,30 +87,32 @@
 		HEIGHT      = 128
 	};
 
-	vk::VkFormat									m_colorAttachmentFormat;
+	vk::VkFormat											m_colorAttachmentFormat;
 
-	vk::VkPrimitiveTopology							m_topology;
+	vk::VkPrimitiveTopology									m_topology;
 
-	const vk::DeviceInterface&						m_vk;
+	const vk::DeviceInterface&								m_vk;
 
-	vk::GraphicsPipelineWrapper						m_pipeline;
-	vk::Move<vk::VkPipelineLayout>					m_pipelineLayout;
+	vk::GraphicsPipelineWrapper								m_pipeline;
+	vk::Move<vk::VkPipelineLayout>							m_pipelineLayout;
 
-	de::SharedPtr<Draw::Image>						m_colorTargetImage;
-	vk::Move<vk::VkImageView>						m_colorTargetView;
+	de::SharedPtr<Draw::Image>								m_colorTargetImage;
+	vk::Move<vk::VkImageView>								m_colorTargetView;
 
-	Draw::PipelineCreateInfo::VertexInputState		m_vertexInputState;
-	de::SharedPtr<Draw::Buffer>						m_vertexBuffer;
+	Draw::PipelineCreateInfo::VertexInputState				m_vertexInputState;
+	de::SharedPtr<Draw::Buffer>								m_vertexBuffer;
 
-	vk::Move<vk::VkCommandPool>						m_cmdPool;
-	vk::Move<vk::VkCommandBuffer>					m_cmdBuffer;
+	vk::Move<vk::VkCommandPool>								m_cmdPool;
+	vk::Move<vk::VkCommandBuffer>							m_cmdBuffer;
 
-	vk::Move<vk::VkFramebuffer>						m_framebuffer;
-	vk::Move<vk::VkRenderPass>						m_renderPass;
+	vk::Move<vk::VkFramebuffer>								m_framebuffer;
+	vk::Move<vk::VkRenderPass>								m_renderPass;
 
-	const std::string								m_vertexShaderName;
-	const std::string								m_fragmentShaderName;
-	std::vector<PositionColorVertex>				m_data;
+	const std::string										m_vertexShaderName;
+	const std::string										m_fragmentShaderName;
+	std::vector<PositionColorVertex>						m_data;
+
+	Draw::PipelineCreateInfo::ColorBlendState::Attachment	m_attachmentState;
 };
 
 } // DynamicState
diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateClearTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateClearTests.cpp
new file mode 100644
index 0000000..bb42659
--- /dev/null
+++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateClearTests.cpp
@@ -0,0 +1,429 @@
+/*------------------------------------------------------------------------
+ * Vulkan Conformance Tests
+ * ------------------------
+ *
+ * Copyright (c) 2022 LunarG, Inc.
+ * Copyright (c) 2022 The Khronos Group Inc.
+ * Copyright (c) 2022 Google LLC
+ *
+ * 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.
+ *
+ *//*!
+ * \file
+ * \brief Dynamic State Clear Tests
+ *//*--------------------------------------------------------------------*/
+
+#include "vktDynamicStateClearTests.hpp"
+
+#include "vktDynamicStateBaseClass.hpp"
+#include "vktDynamicStateTestCaseUtil.hpp"
+
+#include "vkImageUtil.hpp"
+#include "vkCmdUtil.hpp"
+
+#include "tcuImageCompare.hpp"
+#include "tcuTextureUtil.hpp"
+#include "tcuRGBA.hpp"
+#include "vkQueryUtil.hpp"
+
+
+namespace vkt
+{
+namespace DynamicState
+{
+
+using namespace Draw;
+
+namespace
+{
+
+class CmdBaseCase : public DynamicStateBaseClass
+{
+public:
+	CmdBaseCase (Context& context, vk::PipelineConstructionType pipelineConstructionType, const char* vertexShaderName, const char* fragmentShaderName)
+		: DynamicStateBaseClass	(context, pipelineConstructionType, vertexShaderName, fragmentShaderName)
+	{
+		m_topology = vk::VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
+
+		m_data.push_back(PositionColorVertex(tcu::Vec4(0.0f, 0.0f, 1.0f, 1.0f), tcu::RGBA::green().toVec()));
+		m_data.push_back(PositionColorVertex(tcu::Vec4(1.0f, 0.0f, 1.0f, 1.0f), tcu::RGBA::green().toVec()));
+
+		m_attachmentState.blendEnable = VK_TRUE;
+		m_attachmentState.srcColorBlendFactor = vk::VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR;
+		m_attachmentState.dstColorBlendFactor = vk::VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR;
+		m_attachmentState.colorBlendOp = vk::VK_BLEND_OP_ADD;
+		m_attachmentState.srcAlphaBlendFactor = vk::VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA;
+		m_attachmentState.dstAlphaBlendFactor = vk::VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA;
+		m_attachmentState.alphaBlendOp = vk::VK_BLEND_OP_ADD;
+	}
+
+	virtual tcu::Texture2D buildReferenceFrame (int lineWidth)
+	{
+		(void)lineWidth;
+		DE_ASSERT(false);
+		return tcu::Texture2D(tcu::TextureFormat(), 0, 0);
+	}
+
+	virtual void command (bool)
+	{
+		DE_ASSERT(false);
+	}
+
+	virtual tcu::TestStatus iterate (void)
+	{
+		tcu::TestLog&					log					= m_context.getTestContext().getLog();
+		const vk::InstanceInterface&	vkInstance			= m_context.getInstanceInterface();
+		const vk::VkPhysicalDevice		vkPhysicalDevice	= m_context.getPhysicalDevice();
+		const vk::VkQueue				queue				= m_context.getUniversalQueue();
+		const vk::VkDevice				device				= m_context.getDevice();
+
+		const float						lineWidth			= getPhysicalDeviceProperties(vkInstance, vkPhysicalDevice).limits.lineWidthRange[1];
+
+		vk::beginCommandBuffer(m_vk, *m_cmdBuffer, 0u);
+
+		// set dynamic states
+		const vk::VkViewport			viewport	= { 0.0f, 0.0f, static_cast<float>(WIDTH / 2), static_cast<float>(HEIGHT / 2), 0.0f, 0.0f };
+		const vk::VkRect2D				scissor		= { { 0, 0 }, { WIDTH, HEIGHT } };
+
+		setDynamicViewportState(1, &viewport, &scissor);
+		setDynamicRasterizationState(lineWidth);
+		setDynamicBlendState(0.75f, 0.75f, 0.75f, 0.75f);
+		setDynamicDepthStencilState(0.0f, 1.0f);
+
+		const vk::VkExtent3D			imageExtent		= { WIDTH, HEIGHT, 1 };
+
+		vk::VkImageFormatProperties		imageFormatProperties(getPhysicalDeviceImageFormatProperties(vkInstance, vkPhysicalDevice, m_colorAttachmentFormat, vk::VK_IMAGE_TYPE_2D, vk::VK_IMAGE_TILING_OPTIMAL, vk::VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | vk::VK_IMAGE_USAGE_TRANSFER_SRC_BIT | vk::VK_IMAGE_USAGE_TRANSFER_DST_BIT, 0));
+		if ((imageFormatProperties.sampleCounts & m_samples) == 0)
+			TCU_THROW(NotSupportedError, "Color image type not supported");
+
+		const ImageCreateInfo			imageCreateInfo	  (vk::VK_IMAGE_TYPE_2D, m_colorAttachmentFormat, imageExtent, 1, 1, m_samples, vk::VK_IMAGE_TILING_OPTIMAL, vk::VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | vk::VK_IMAGE_USAGE_TRANSFER_SRC_BIT | vk::VK_IMAGE_USAGE_TRANSFER_DST_BIT);
+		m_image = Image::createAndAlloc(m_vk, device, imageCreateInfo, m_context.getDefaultAllocator(), m_context.getUniversalQueueFamilyIndex());
+
+		transition2DImage(m_vk, *m_cmdBuffer, m_colorTargetImage->object(), vk::VK_IMAGE_ASPECT_COLOR_BIT, vk::VK_IMAGE_LAYOUT_UNDEFINED, vk::VK_IMAGE_LAYOUT_GENERAL, 0u, vk::VK_ACCESS_TRANSFER_READ_BIT, vk::VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, vk::VK_PIPELINE_STAGE_TRANSFER_BIT);
+		transition2DImage(m_vk, *m_cmdBuffer, m_image->object(), vk::VK_IMAGE_ASPECT_COLOR_BIT, vk::VK_IMAGE_LAYOUT_UNDEFINED, vk::VK_IMAGE_LAYOUT_GENERAL, 0u, vk::VK_ACCESS_TRANSFER_WRITE_BIT, vk::VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, vk::VK_PIPELINE_STAGE_TRANSFER_BIT);
+
+		// should not interfere with dynamic state
+		command(false);
+
+		const vk::VkClearColorValue clearColor = { { 0.0f, 0.0f, 0.0f, 1.0f } };
+		beginRenderPassWithClearColor(clearColor, true);
+
+		command(true);
+
+		m_vk.cmdBindPipeline(*m_cmdBuffer, vk::VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline.getPipeline());
+
+		const vk::VkDeviceSize vertexBufferOffset	= 0;
+		const vk::VkBuffer		vertexBuffer		= m_vertexBuffer->object();
+		m_vk.cmdBindVertexBuffers(*m_cmdBuffer, 0, 1, &vertexBuffer, &vertexBufferOffset);
+
+		m_vk.cmdDraw(*m_cmdBuffer, 6, 1, 0, 0);
+
+		endRenderPass(m_vk, *m_cmdBuffer);
+		endCommandBuffer(m_vk, *m_cmdBuffer);
+
+		submitCommandsAndWait(m_vk, device, queue, m_cmdBuffer.get());
+
+		// validation
+		{
+			tcu::Texture2D referenceFrame = buildReferenceFrame(static_cast<int>(lineWidth));
+
+			const vk::VkOffset3D zeroOffset = { 0, 0, 0 };
+			const tcu::ConstPixelBufferAccess renderedFrame = m_colorTargetImage->readSurface(queue, m_context.getDefaultAllocator(),
+				vk::VK_IMAGE_LAYOUT_GENERAL, zeroOffset, WIDTH, HEIGHT, vk::VK_IMAGE_ASPECT_COLOR_BIT);
+
+			if (!tcu::fuzzyCompare(log, "Result", "Image comparison result",
+				referenceFrame.getLevel(0), renderedFrame, 0.05f,
+				tcu::COMPARE_LOG_RESULT))
+			{
+				return tcu::TestStatus(QP_TEST_RESULT_FAIL, "Image verification failed");
+			}
+
+			return tcu::TestStatus(QP_TEST_RESULT_PASS, "Image verification passed");
+		}
+	}
+
+	de::SharedPtr<Draw::Image> m_image;
+	vk::VkSampleCountFlagBits m_samples = vk::VK_SAMPLE_COUNT_1_BIT;
+};
+
+class ClearTestInstance : public CmdBaseCase
+{
+public:
+	ClearTestInstance (Context& context, vk::PipelineConstructionType pipelineConstructionType, ShaderMap shaders)
+		: CmdBaseCase	(context, pipelineConstructionType, shaders[glu::SHADERTYPE_VERTEX], shaders[glu::SHADERTYPE_FRAGMENT])
+	{
+		DynamicStateBaseClass::initialize();
+	}
+
+	virtual void command (bool renderPassActive)
+	{
+		if (renderPassActive) {
+			// Clear attachment
+			vk::VkClearValue clearValue;
+			clearValue.color.float32[0] = 1.0f;
+			clearValue.color.float32[1] = 1.0f;
+			clearValue.color.float32[2] = 1.0f;
+			clearValue.color.float32[3] = 1.0f;
+			const vk::VkClearAttachment clearAttachment =
+			{
+				vk::VK_IMAGE_ASPECT_COLOR_BIT,		// VkImageAspectFlags	aspectMask
+				0u,									// uint32_t				colorAttachment
+				clearValue						// VkClearValue			clearValue
+			};
+			const vk::VkClearRect rect = { { { 0, 0 }, { WIDTH, HEIGHT } }, 0, 1 };
+			m_vk.cmdClearAttachments(*m_cmdBuffer, 1, &clearAttachment, 1, &rect);
+		}
+	}
+
+	virtual tcu::Texture2D buildReferenceFrame (int lineWidth)
+	{
+		tcu::Texture2D referenceFrame(vk::mapVkFormat(m_colorAttachmentFormat), WIDTH, HEIGHT);
+		referenceFrame.allocLevel(0);
+
+		const deInt32 frameWidth	= referenceFrame.getWidth();
+		const deInt32 frameHeight	= referenceFrame.getHeight();
+
+		tcu::clear(referenceFrame.getLevel(0), tcu::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+		for (int y = 0; y < frameHeight; y++)
+		{
+			for (int x = 0; x < frameWidth; x++)
+			{
+				if (y < frameHeight / 2 && y >= 32 - lineWidth / 2 && y < 32 + lineWidth / 2 && x >= frameWidth / 4 && x < frameWidth / 2)
+					referenceFrame.getLevel(0).setPixel(tcu::Vec4(0.25f, 0.5f, 0.25f, 0.5f), x, y);
+				else
+					referenceFrame.getLevel(0).setPixel(tcu::Vec4(1.0f, 1.0f, 1.0f, 1.0f), x, y);
+			}
+		}
+
+		return referenceFrame;
+	}
+};
+
+class BlitTestInstance : public CmdBaseCase
+{
+public:
+	BlitTestInstance (Context& context, vk::PipelineConstructionType pipelineConstructionType, ShaderMap shaders)
+		: CmdBaseCase	(context, pipelineConstructionType, shaders[glu::SHADERTYPE_VERTEX], shaders[glu::SHADERTYPE_FRAGMENT])
+	{
+		DynamicStateBaseClass::initialize();
+	}
+
+	virtual void command (bool renderPassActive)
+	{
+		if (!renderPassActive) {
+			const vk::VkImageBlit		blitRegion =
+			{
+				// Src
+				{
+					vk::VK_IMAGE_ASPECT_COLOR_BIT,
+					0,	// mipLevel
+					0,	// arrayLayer
+					1	// layerCount
+				},
+				{
+					{ 0, 0, 0 },
+					{
+						WIDTH,
+						HEIGHT,
+						1
+					},
+				},
+
+				// Dst
+				{
+					vk::VK_IMAGE_ASPECT_COLOR_BIT,
+					0,	// mipLevel
+					0,	// arrayLayer
+					1	// layerCount
+				},
+				{
+					{ 0, 0, 0 },
+					{
+						WIDTH,
+						HEIGHT,
+						1u
+					}
+				}
+			};
+			m_vk.cmdBlitImage(*m_cmdBuffer, m_colorTargetImage->object(), vk::VK_IMAGE_LAYOUT_GENERAL, m_image->object(), vk::VK_IMAGE_LAYOUT_GENERAL, 1, &blitRegion, vk::VK_FILTER_NEAREST);
+		}
+	}
+
+	virtual tcu::Texture2D buildReferenceFrame (int lineWidth)
+	{
+		tcu::Texture2D referenceFrame(vk::mapVkFormat(m_colorAttachmentFormat), WIDTH, HEIGHT);
+		referenceFrame.allocLevel(0);
+
+		const deInt32 frameWidth	= referenceFrame.getWidth();
+		const deInt32 frameHeight	= referenceFrame.getHeight();
+
+		tcu::clear(referenceFrame.getLevel(0), tcu::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+		for (int y = 0; y < frameHeight; y++)
+		{
+			for (int x = 0; x < frameWidth; x++)
+			{
+				if (y < frameHeight / 2 && y >= 32 - lineWidth / 2 && y < 32 + lineWidth / 2 && x >= frameWidth / 4 && x < frameWidth / 2)
+					referenceFrame.getLevel(0).setPixel(tcu::Vec4(0.0f, 0.25f, 0.0f, 0.5f), x, y);
+			}
+		}
+
+		return referenceFrame;
+	}
+};
+
+class CopyTestInstance : public CmdBaseCase
+{
+public:
+	CopyTestInstance	(Context& context, vk::PipelineConstructionType pipelineConstructionType, ShaderMap shaders)
+		: CmdBaseCase (context, pipelineConstructionType, shaders[glu::SHADERTYPE_VERTEX], shaders[glu::SHADERTYPE_FRAGMENT])
+	{
+		DynamicStateBaseClass::initialize();
+	}
+
+	virtual void command (bool renderPassActive)
+	{
+		if (!renderPassActive) {
+			const vk::VkImageSubresourceLayers imgSubResLayers =
+			{
+				vk::VK_IMAGE_ASPECT_COLOR_BIT,	// VkImageAspectFlags  aspectMask;
+				0u,								// deUint32            mipLevel;
+				0u,								// deUint32            baseArrayLayer;
+				1u,								// deUint32            layerCount;
+			};
+			const vk::VkOffset3D offset = { 0, 0, 0 };
+			const vk::VkExtent3D extent = { WIDTH, HEIGHT, 1 };
+
+			const vk::VkImageCopy copyRegion =
+			{
+				imgSubResLayers,	// VkImageSubresourceCopy  srcSubresource;
+				offset,				// VkOffset3D              srcOffset;
+				imgSubResLayers,	// VkImageSubresourceCopy  destSubresource;
+				offset,				// VkOffset3D              destOffset;
+				extent,				// VkExtent3D              extent;
+			};
+
+			m_vk.cmdCopyImage(*m_cmdBuffer, m_colorTargetImage->object(), vk::VK_IMAGE_LAYOUT_GENERAL, m_image->object(), vk::VK_IMAGE_LAYOUT_GENERAL, 1, &copyRegion);
+		}
+	}
+
+	virtual tcu::Texture2D buildReferenceFrame (int lineWidth)
+	{
+		tcu::Texture2D referenceFrame(vk::mapVkFormat(m_colorAttachmentFormat), WIDTH, HEIGHT);
+		referenceFrame.allocLevel(0);
+
+		const deInt32 frameWidth	= referenceFrame.getWidth();
+		const deInt32 frameHeight	= referenceFrame.getHeight();
+
+		tcu::clear(referenceFrame.getLevel(0), tcu::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+		for (int y = 0; y < frameHeight; y++)
+		{
+			for (int x = 0; x < frameWidth; x++)
+			{
+				if (y < frameHeight / 2 && y >= 32 - lineWidth / 2 && y < 32 + lineWidth / 2 && x >= frameWidth / 4 && x < frameWidth / 2)
+					referenceFrame.getLevel(0).setPixel(tcu::Vec4(0.0f, 0.25f, 0.0f, 0.5f), x, y);
+			}
+		}
+
+		return referenceFrame;
+	}
+};
+
+class ResolveTestInstance : public CmdBaseCase
+{
+public:
+	ResolveTestInstance (Context& context, vk::PipelineConstructionType pipelineConstructionType, ShaderMap shaders)
+		: CmdBaseCase	(context, pipelineConstructionType, shaders[glu::SHADERTYPE_VERTEX], shaders[glu::SHADERTYPE_FRAGMENT])
+	{
+		DynamicStateBaseClass::initialize();
+
+		m_samples = vk::VK_SAMPLE_COUNT_2_BIT;
+	}
+
+	virtual void command (bool renderPassActive)
+	{
+		if (!renderPassActive) {
+			const vk::VkImageSubresourceLayers imgSubResLayers =
+			{
+				vk::VK_IMAGE_ASPECT_COLOR_BIT,	// VkImageAspectFlags  aspectMask;
+				0u,								// deUint32            mipLevel;
+				0u,								// deUint32            baseArrayLayer;
+				1u,								// deUint32            layerCount;
+			};
+			const vk::VkOffset3D offset = { 0, 0, 0 };
+			const vk::VkExtent3D extent = { WIDTH, HEIGHT, 1 };
+
+			const vk::VkImageResolve			resolveRegion =
+			{
+				imgSubResLayers,	// VkImageSubresourceLayers	srcSubresource;
+				offset,				// VkOffset3D				srcOffset;
+				imgSubResLayers,	// VkImageSubresourceLayers	dstSubresource;
+				offset,				// VkOffset3D				dstOffset;
+				extent,				// VkExtent3D				extent;
+			};
+			m_vk.cmdResolveImage(*m_cmdBuffer, m_image->object(), vk::VK_IMAGE_LAYOUT_GENERAL, m_colorTargetImage->object(), vk::VK_IMAGE_LAYOUT_GENERAL, 1, &resolveRegion);
+		}
+	}
+
+	virtual tcu::Texture2D buildReferenceFrame (int lineWidth)
+	{
+		tcu::Texture2D referenceFrame(vk::mapVkFormat(m_colorAttachmentFormat), WIDTH, HEIGHT);
+		referenceFrame.allocLevel(0);
+
+		const deInt32 frameWidth	= referenceFrame.getWidth();
+		const deInt32 frameHeight	= referenceFrame.getHeight();
+
+		tcu::clear(referenceFrame.getLevel(0), tcu::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+		for (int y = 0; y < frameHeight; y++)
+		{
+			for (int x = 0; x < frameWidth; x++)
+			{
+				if (y < frameHeight / 2 && y >= 32 - lineWidth / 2 && y < 32 + lineWidth / 2 && x >= frameWidth / 4 && x < frameWidth / 2)
+					referenceFrame.getLevel(0).setPixel(tcu::Vec4(0.0f, 0.25f, 0.0f, 0.5f), x, y);
+			}
+		}
+
+		return referenceFrame;
+	}
+};
+
+} //anonymous
+
+DynamicStateClearTests::DynamicStateClearTests (tcu::TestContext& testCtx, vk::PipelineConstructionType pipelineConstructionType)
+	: TestCaseGroup					(testCtx, "image", "Tests for dynamic state")
+	, m_pipelineConstructionType	(pipelineConstructionType)
+{
+	/* Left blank on purpose */
+}
+
+DynamicStateClearTests::~DynamicStateClearTests()
+{
+}
+
+void DynamicStateClearTests::init (void)
+{
+	ShaderMap shaderPaths;
+	shaderPaths[glu::SHADERTYPE_VERTEX] = "vulkan/dynamic_state/VertexFetch.vert";
+	shaderPaths[glu::SHADERTYPE_FRAGMENT] = "vulkan/dynamic_state/VertexFetch.frag";
+
+	addChild(new InstanceFactory<ClearTestInstance>(m_testCtx, "clear", "Clear attachment after setting dynamic states", m_pipelineConstructionType, shaderPaths));
+	addChild(new InstanceFactory<BlitTestInstance>(m_testCtx, "blit", "Blit image after setting dynamic states", m_pipelineConstructionType, shaderPaths));
+	addChild(new InstanceFactory<CopyTestInstance>(m_testCtx, "copy", "Copy image after setting dynamic states", m_pipelineConstructionType, shaderPaths));
+	addChild(new InstanceFactory<ResolveTestInstance>(m_testCtx, "resolve", "Resolve image after setting dynamic states", m_pipelineConstructionType, shaderPaths));
+}
+
+} // DynamicState
+} // vkt
diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateClearTests.hpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateClearTests.hpp
new file mode 100644
index 0000000..fbc7d46
--- /dev/null
+++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateClearTests.hpp
@@ -0,0 +1,54 @@
+#ifndef _VKTDYNAMICSTATECLEARTESTS_HPP
+#define _VKTDYNAMICSTATECLEARTESTS_HPP
+/*------------------------------------------------------------------------
+ * Vulkan Conformance Tests
+ * ------------------------
+ *
+ * Copyright (c) 2022 LunarG, Inc.
+ * Copyright (c) 2022 The Khronos Group Inc.
+ * Copyright (c) 2022 Google LLC
+ *
+ * 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.
+ *
+ *//*!
+ * \file
+ * \brief Dynamic State Clear Tests
+ *//*--------------------------------------------------------------------*/
+
+#include "tcuDefs.hpp"
+#include "vktTestCase.hpp"
+#include "vkPipelineConstructionUtil.hpp"
+
+namespace vkt
+{
+namespace DynamicState
+{
+
+class DynamicStateClearTests : public tcu::TestCaseGroup
+{
+public:
+					DynamicStateClearTests	(tcu::TestContext& testCtx, vk::PipelineConstructionType pipelineConstructionType);
+					~DynamicStateClearTests	(void);
+	void			init					(void);
+
+private:
+	DynamicStateClearTests					(const DynamicStateClearTests& other);
+	DynamicStateClearTests&		operator=	(const DynamicStateClearTests& other);
+
+	vk::PipelineConstructionType	m_pipelineConstructionType;
+};
+
+} // DynamicState
+} // vkt
+
+#endif // _VKTDYNAMICSTATECLEARTESTS_HPP
diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateTests.cpp
index 9d13c5d..040095b 100644
--- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateTests.cpp
+++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateTests.cpp
@@ -31,6 +31,7 @@
 #include "vktDynamicStateGeneralTests.hpp"
 #include "vktDynamicStateComputeTests.hpp"
 #include "vktDynamicStateInheritanceTests.hpp"
+#include "vktDynamicStateClearTests.hpp"
 #include "vktTestGroupUtil.hpp"
 
 namespace vkt
@@ -51,6 +52,7 @@
 	group->addChild(new DynamicStateDSTests				(testCtx, pipelineConstructionType));
 	group->addChild(new DynamicStateGeneralTests		(testCtx, pipelineConstructionType));
 	group->addChild(new DynamicStateInheritanceTests	(testCtx, pipelineConstructionType));
+	group->addChild(new DynamicStateClearTests			(testCtx, pipelineConstructionType));
 
 	if (pipelineConstructionType == vk::PIPELINE_CONSTRUCTION_TYPE_MONOLITHIC)
 		group->addChild(createDynamicStateComputeTests	(testCtx));
diff --git a/external/vulkancts/mustpass/main/vk-default/dynamic-state.txt b/external/vulkancts/mustpass/main/vk-default/dynamic-state.txt
index 5163711..1a9bc2a 100644
--- a/external/vulkancts/mustpass/main/vk-default/dynamic-state.txt
+++ b/external/vulkancts/mustpass/main/vk-default/dynamic-state.txt
@@ -21,6 +21,10 @@
 dEQP-VK.dynamic_state.pipeline_library.inheritance.split
 dEQP-VK.dynamic_state.pipeline_library.inheritance.primary_with_count
 dEQP-VK.dynamic_state.pipeline_library.inheritance.secondary_with_count
+dEQP-VK.dynamic_state.pipeline_library.image.clear
+dEQP-VK.dynamic_state.pipeline_library.image.blit
+dEQP-VK.dynamic_state.pipeline_library.image.copy
+dEQP-VK.dynamic_state.pipeline_library.image.resolve
 dEQP-VK.dynamic_state.monolithic.vp_state.viewport
 dEQP-VK.dynamic_state.monolithic.vp_state.scissor
 dEQP-VK.dynamic_state.monolithic.vp_state.viewport_array
@@ -44,6 +48,10 @@
 dEQP-VK.dynamic_state.monolithic.inheritance.split
 dEQP-VK.dynamic_state.monolithic.inheritance.primary_with_count
 dEQP-VK.dynamic_state.monolithic.inheritance.secondary_with_count
+dEQP-VK.dynamic_state.monolithic.image.clear
+dEQP-VK.dynamic_state.monolithic.image.blit
+dEQP-VK.dynamic_state.monolithic.image.copy
+dEQP-VK.dynamic_state.monolithic.image.resolve
 dEQP-VK.dynamic_state.monolithic.compute_transfer.single.compute.viewport.before
 dEQP-VK.dynamic_state.monolithic.compute_transfer.single.compute.viewport.after
 dEQP-VK.dynamic_state.monolithic.compute_transfer.single.compute.scissor.before
@@ -191,3 +199,7 @@
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.split
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.primary_with_count
 dEQP-VK.dynamic_state.fast_linked_library.inheritance.secondary_with_count
+dEQP-VK.dynamic_state.fast_linked_library.image.clear
+dEQP-VK.dynamic_state.fast_linked_library.image.blit
+dEQP-VK.dynamic_state.fast_linked_library.image.copy
+dEQP-VK.dynamic_state.fast_linked_library.image.resolve
diff --git a/external/vulkancts/mustpass/main/vksc-default/dynamic-state.txt b/external/vulkancts/mustpass/main/vksc-default/dynamic-state.txt
index f4ddbf6..0fd4e32 100644
--- a/external/vulkancts/mustpass/main/vksc-default/dynamic-state.txt
+++ b/external/vulkancts/mustpass/main/vksc-default/dynamic-state.txt
@@ -14,6 +14,10 @@
 dEQP-VKSC.dynamic_state.pipeline_library.general_state.bind_order
 dEQP-VKSC.dynamic_state.pipeline_library.general_state.state_persistence
 dEQP-VKSC.dynamic_state.pipeline_library.inheritance.baseline
+dEQP-VKSC.dynamic_state.pipeline_library.image.clear
+dEQP-VKSC.dynamic_state.pipeline_library.image.blit
+dEQP-VKSC.dynamic_state.pipeline_library.image.copy
+dEQP-VKSC.dynamic_state.pipeline_library.image.resolve
 dEQP-VKSC.dynamic_state.monolithic.vp_state.viewport
 dEQP-VKSC.dynamic_state.monolithic.vp_state.scissor
 dEQP-VKSC.dynamic_state.monolithic.vp_state.viewport_array
@@ -30,6 +34,10 @@
 dEQP-VKSC.dynamic_state.monolithic.general_state.bind_order
 dEQP-VKSC.dynamic_state.monolithic.general_state.state_persistence
 dEQP-VKSC.dynamic_state.monolithic.inheritance.baseline
+dEQP-VKSC.dynamic_state.monolithic.image.clear
+dEQP-VKSC.dynamic_state.monolithic.image.blit
+dEQP-VKSC.dynamic_state.monolithic.image.copy
+dEQP-VKSC.dynamic_state.monolithic.image.resolve
 dEQP-VKSC.dynamic_state.monolithic.compute_transfer.single.compute.viewport.before
 dEQP-VKSC.dynamic_state.monolithic.compute_transfer.single.compute.viewport.after
 dEQP-VKSC.dynamic_state.monolithic.compute_transfer.single.compute.scissor.before
@@ -150,3 +158,7 @@
 dEQP-VKSC.dynamic_state.fast_linked_library.general_state.bind_order
 dEQP-VKSC.dynamic_state.fast_linked_library.general_state.state_persistence
 dEQP-VKSC.dynamic_state.fast_linked_library.inheritance.baseline
+dEQP-VKSC.dynamic_state.fast_linked_library.image.clear
+dEQP-VKSC.dynamic_state.fast_linked_library.image.blit
+dEQP-VKSC.dynamic_state.fast_linked_library.image.copy
+dEQP-VKSC.dynamic_state.fast_linked_library.image.resolve