Partial support for input attachments

src/Pipeline/PixelProgram.cpp

@@ -24,6 +24,9 @@ namespace sw
 
 	void PixelProgram::setBuiltins(Int &x, Int &y, Float4(&z)[4], Float4 &w)
 	{
+		routine.windowSpacePosition[0] = x + SIMD::Int(0,1,0,1);
+		routine.windowSpacePosition[1] = y + SIMD::Int(0,0,1,1);
+
 		auto it = spirvShader->inputBuiltins.find(spv::BuiltInFragCoord);
 		if (it != spirvShader->inputBuiltins.end())
 		{

src/Pipeline/SpirvShader.hpp

@@ -45,6 +45,7 @@ namespace vk
 	class PipelineLayout;
 	class ImageView;
 	class Sampler;
+	class RenderPass;
 } // namespace vk
 
 namespace sw
@@ -474,7 +475,7 @@ namespace sw
 			return serialID;
 		}
 
-		explicit SpirvShader(InsnStore const &insns);
+		SpirvShader(InsnStore const &insns, vk::RenderPass *renderPass, uint32_t subpassIndex);
 
 		struct Modes
 		{
@@ -565,11 +566,13 @@ namespace sw
 		{
 			int32_t DescriptorSet = -1;
 			int32_t Binding = -1;
+			int32_t InputAttachmentIndex = -1;
 
 			void Apply(DescriptorDecorations const &src);
 		};
 
 		std::unordered_map<Object::ID, DescriptorDecorations> descriptorDecorations;
+		std::vector<VkFormat> inputAttachmentFormats;
 
 		struct InterfaceComponent
 		{
@@ -840,7 +843,7 @@ namespace sw
 		EmitResult EmitAtomicOp(InsnIterator insn, EmitState *state) const;
 		EmitResult EmitAtomicCompareExchange(InsnIterator insn, EmitState *state) const;
 
-		SIMD::Pointer GetTexelAddress(SIMD::Pointer base, GenericValue const & coordinate, Type const & imageType, Pointer<Byte> descriptor, int texelSize) const;
+		SIMD::Pointer GetTexelAddress(SpirvRoutine const * routine, SIMD::Pointer base, GenericValue const & coordinate, Type const & imageType, Pointer<Byte> descriptor, int texelSize) const;
 
 		// OpcodeName() returns the name of the opcode op.
 		// If NDEBUG is defined, then OpcodeName() will only return the numerical code.
@@ -896,6 +899,7 @@ namespace sw
 		Pointer<Int> descriptorDynamicOffsets;
 		Pointer<Byte> pushConstants;
 		Int killMask = Int{0};
+		SIMD::Int windowSpacePosition[2];
 
 		void createVariable(SpirvShader::Object::ID id, uint32_t size)
 		{

src/Vulkan/VkPipeline.cpp

@@ -15,6 +15,7 @@
 #include "VkPipeline.hpp"
 #include "VkPipelineLayout.hpp"
 #include "VkShaderModule.hpp"
+#include "VkRenderPass.hpp"
 #include "Pipeline/ComputeProgram.hpp"
 #include "Pipeline/SpirvShader.hpp"
 
@@ -452,7 +453,7 @@ void GraphicsPipeline::compileShaders(const VkAllocationCallbacks* pAllocator, c
 
 		// FIXME (b/119409619): use an allocator here so we can control all memory allocations
 		// TODO: also pass in any pipeline state which will affect shader compilation
-		auto spirvShader = new sw::SpirvShader{code};
+		auto spirvShader = new sw::SpirvShader{code, Cast(pCreateInfo->renderPass), pCreateInfo->subpass};
 
 		switch (pStage->stage)
 		{
@@ -544,7 +545,7 @@ void ComputePipeline::compileShaders(const VkAllocationCallbacks* pAllocator, co
 	ASSERT(shader == nullptr);
 
 	// FIXME(b/119409619): use allocator.
-	shader = new sw::SpirvShader(code);
+	shader = new sw::SpirvShader(code, nullptr, 0);
 	vk::DescriptorSet::Bindings descriptorSets;  // FIXME(b/129523279): Delay code generation until invoke time.
 	sw::ComputeProgram program(shader, layout, descriptorSets);