Reduce size of SampledImageDescriptor

src/Pipeline/SpirvShaderImage.cpp

@@ -157,8 +157,8 @@ void SpirvShader::EmitImageSampleUnconditional(Array<SIMD::Float> &out, ImageIns
 
 	auto coordinate = Operand(this, state, coordinateId);
 
-	rr::Int samplerId = *Pointer<rr::Int>(samplerDescriptor + OFFSET(vk::SampledImageDescriptor, sampler) + OFFSET(vk::Sampler, id));  // vk::Sampler::id
-	Pointer<Byte> texture = imageDescriptor + OFFSET(vk::SampledImageDescriptor, texture);                                             // sw::Texture*
+	rr::Int samplerId = *Pointer<rr::Int>(samplerDescriptor + OFFSET(vk::SampledImageDescriptor, samplerId));  // vk::Sampler::id
+	Pointer<Byte> texture = imageDescriptor + OFFSET(vk::SampledImageDescriptor, texture);                     // sw::Texture*
 
 	// Above we assumed that if the SampledImage operand is not the result of an OpSampledImage,
 	// it must be a combined image sampler loaded straight from the descriptor set. For OpImageFetch

src/Vulkan/VkDescriptorSetLayout.cpp

@@ -175,7 +175,7 @@ void DescriptorSetLayout::initialize(DescriptorSet *descriptorSet)
 			for(uint32_t j = 0; j < bindings[i].descriptorCount; j++)
 			{
 				SampledImageDescriptor *imageSamplerDescriptor = reinterpret_cast<SampledImageDescriptor *>(mem);
-				imageSamplerDescriptor->updateSampler(bindings[i].immutableSamplers[j]);
+				imageSamplerDescriptor->samplerId = bindings[i].immutableSamplers[j]->id;
 				mem += descriptorSize;
 			}
 		}
@@ -245,11 +245,6 @@ uint8_t *DescriptorSetLayout::getDescriptorPointer(DescriptorSet *descriptorSet,
 	return &descriptorSet->data[byteOffset];
 }
 
-void SampledImageDescriptor::updateSampler(const vk::Sampler *newSampler)
-{
-	memcpy(reinterpret_cast<void *>(&sampler), newSampler, sizeof(sampler));
-}
-
 void DescriptorSetLayout::WriteDescriptorSet(Device *device, DescriptorSet *dstSet, VkDescriptorUpdateTemplateEntry const &entry, char const *src)
 {
 	DescriptorSetLayout *dstLayout = dstSet->header.layout;
@@ -273,7 +268,7 @@ void DescriptorSetLayout::WriteDescriptorSet(Device *device, DescriptorSet *dstS
 			//  descriptorCount of zero, must all either use immutable samplers or must all not use immutable samplers."
 			if(!binding.immutableSamplers)
 			{
-				sampledImage[i].updateSampler(vk::Cast(update->sampler));
+				sampledImage[i].samplerId = vk::Cast(update->sampler)->id;
 			}
 			sampledImage[i].device = device;
 		}
@@ -332,7 +327,7 @@ void DescriptorSetLayout::WriteDescriptorSet(Device *device, DescriptorSet *dstS
 				//  descriptorCount of zero, must all either use immutable samplers or must all not use immutable samplers."
 				if(!binding.immutableSamplers)
 				{
-					sampledImage[i].updateSampler(vk::Cast(update->sampler));
+					sampledImage[i].samplerId = vk::Cast(update->sampler)->id;
 				}
 			}
 

src/Vulkan/VkDescriptorSetLayout.hpp

@@ -33,13 +33,9 @@ struct alignas(16) SampledImageDescriptor
 {
 	~SampledImageDescriptor() = delete;
 
-	void updateSampler(const vk::Sampler *sampler);
-
-	// TODO(b/129523279): Minimize to the data actually needed.
-	vk::Sampler sampler;
-	vk::Device *device;
-
+	uint32_t samplerId;
 	uint32_t imageViewId;
+
 	alignas(16) sw::Texture texture;
 	int width;  // Of base mip-level.
 	int height;
@@ -47,6 +43,7 @@ struct alignas(16) SampledImageDescriptor
 	int mipLevels;
 	int sampleCount;
 
+	Device *device;
 	ImageView *memoryOwner;  // Pointer to the view which owns the memory used by the descriptor set
 };