Set render targets correctly when drawing

src/Device/PixelProcessor.cpp

@@ -97,6 +97,11 @@ namespace sw
 		context->renderTargetLayer[index] = layer;
 	}
 
+	Surface *PixelProcessor::getRenderTarget(int index)
+	{
+		return context->renderTarget[index];
+	}
+
 	void PixelProcessor::setDepthBuffer(Surface *depthBuffer, unsigned int layer)
 	{
 		context->depthBuffer = depthBuffer;

src/Device/PixelProcessor.hpp

@@ -153,6 +153,7 @@ namespace sw
 		void lockUniformBuffers(byte** u, sw::Resource* uniformBuffers[]);
 
 		void setRenderTarget(int index, Surface *renderTarget, unsigned int layer = 0);
+		Surface *getRenderTarget(int index);
 		void setDepthBuffer(Surface *depthBuffer, unsigned int layer = 0);
 		void setStencilBuffer(Surface *stencilBuffer, unsigned int layer = 0);
 

src/Vulkan/VkCommandBuffer.cpp

@@ -17,6 +17,7 @@
 #include "VkEvent.hpp"
 #include "VkFramebuffer.hpp"
 #include "VkImage.hpp"
+#include "VkImageView.hpp"
 #include "VkPipeline.hpp"
 #include "VkRenderPass.hpp"
 #include "Device/Renderer.hpp"
@@ -164,6 +165,16 @@ struct Draw : public CommandBuffer::Command
 		executionState.renderer->setViewport(pipeline->getViewport());
 		executionState.renderer->setBlendConstant(pipeline->getBlendConstants());
 
+		for (auto i = 0u; i < executionState.renderPass->getCurrentSubpass().colorAttachmentCount; i++)
+		{
+			auto attachmentReference = executionState.renderPass->getCurrentSubpass().pColorAttachments[i];
+			if (attachmentReference.attachment != VK_ATTACHMENT_UNUSED)
+			{
+				auto attachment = executionState.renderPassFramebuffer->getAttachment(attachmentReference.attachment);
+				executionState.renderer->setRenderTarget(i, attachment->asSurface(), 0);
+			}
+		}
+
 		const uint32_t primitiveCount = pipeline->computePrimitiveCount(vertexCount);
 		const uint32_t lastInstance = firstInstance + instanceCount - 1;
 		for(uint32_t instance = firstInstance; instance <= lastInstance; instance++)
@@ -171,6 +182,22 @@ struct Draw : public CommandBuffer::Command
 			executionState.renderer->setInstanceID(instance);
 			executionState.renderer->draw(context.drawType, 0, primitiveCount);
 		}
+
+		// Wait for completion. We should be able to get rid of this eventually.
+		executionState.renderer->synchronize();
+
+		// Renderer has finished touching the color attachments; destroy the temporary Surface objects.
+		// We shouldn't need to do any of this at draw time.
+		for (auto i = 0u; i < executionState.renderPass->getCurrentSubpass().colorAttachmentCount; i++)
+		{
+			auto attachmentReference = executionState.renderPass->getCurrentSubpass().pColorAttachments[i];
+			if (attachmentReference.attachment != VK_ATTACHMENT_UNUSED)
+			{
+				auto surface = executionState.renderer->getRenderTarget(i);
+				executionState.renderer->setRenderTarget(i, nullptr, 0);
+				delete surface;
+			}
+		}
 	}
 
 	uint32_t vertexCount;

src/Vulkan/VkFramebuffer.cpp

@@ -94,6 +94,11 @@ void Framebuffer::clear(const VkClearAttachment& attachment, const VkClearRect&
 	}
 }
 
+ImageView *Framebuffer::getAttachment(uint32_t index) const
+{
+	return attachments[index];
+}
+
 size_t Framebuffer::ComputeRequiredAllocationSize(const VkFramebufferCreateInfo* pCreateInfo)
 {
 	return pCreateInfo->attachmentCount * sizeof(void*);

src/Vulkan/VkFramebuffer.hpp

@@ -34,6 +34,7 @@ public:
 	void clear(const VkClearAttachment& attachment, const VkClearRect& rect);
 
 	static size_t ComputeRequiredAllocationSize(const VkFramebufferCreateInfo* pCreateInfo);
+	ImageView *getAttachment(uint32_t index) const;
 
 private:
 	RenderPass* renderPass;

src/Vulkan/VkImage.hpp

@@ -48,6 +48,7 @@ public:
 	void clear(const VkClearValue& clearValue, const VkRect2D& renderArea, const VkImageSubresourceRange& subresourceRange);
 	void clear(const VkClearColorValue& color, const VkImageSubresourceRange& subresourceRange);
 	void clear(const VkClearDepthStencilValue& color, const VkImageSubresourceRange& subresourceRange);
+	sw::Surface* asSurface(const VkImageAspectFlags& flags, uint32_t mipLevel, uint32_t layer) const;
 
 	VkImageType              getImageType() const { return imageType; }
 	VkFormat                 getFormat() const { return format; }
@@ -74,7 +75,6 @@ private:
 	VkFormat getClearFormat() const;
 	void clear(void* pixelData, VkFormat format, const VkImageSubresourceRange& subresourceRange, VkImageAspectFlags aspectMask);
 	void clear(void* pixelData, VkFormat format, const VkRect2D& renderArea, const VkImageSubresourceRange& subresourceRange, VkImageAspectFlags aspectMask);
-	sw::Surface* asSurface(const VkImageAspectFlags& flags, uint32_t mipLevel, uint32_t layer) const;
 
 	DeviceMemory*            deviceMemory = nullptr;
 	VkDeviceSize             memoryOffset = 0;

src/Vulkan/VkImageView.cpp

@@ -119,4 +119,9 @@ void ImageView::clear(const VkClearValue& clearValue, const VkImageAspectFlags a
 	image->clear(clearValue, renderArea.rect, sr);
 }
 
+sw::Surface *ImageView::asSurface()
+{
+	return image->asSurface(subresourceRange.aspectMask, subresourceRange.baseArrayLayer, subresourceRange.baseMipLevel);
+}
+
 }
\ No newline at end of file

src/Vulkan/VkImageView.hpp

@@ -34,6 +34,8 @@ public:
 	void clear(const VkClearValue& clearValues, const VkImageAspectFlags aspectMask, const VkRect2D& renderArea);
 	void clear(const VkClearValue& clearValue, const VkImageAspectFlags aspectMask, const VkClearRect& renderArea);
 
+	sw::Surface *asSurface();
+
 private:
 	bool                       imageTypesMatch(VkImageType imageType) const;