Remove commented out code

hrydgard · Oct 10, 2023 · 9c1c09f · 9c1c09f
1 parent ba4d166
commit 9c1c09f
Showing 1 changed file with 0 additions and 141 deletions.
diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp
@@ -272,147 +272,6 @@ void DrawEngineVulkan::DecodeVertsToPushPool(VulkanPushPool *push, uint32_t *bin
 	DecodeVerts(dest);
 }
 
-/*
-VkDescriptorSet DrawEngineVulkan::GetOrCreateDescriptorSet(VkImageView imageView, VkSampler sampler, VkBuffer base, VkBuffer light, VkBuffer bone, bool tess) {
-	_dbg_assert_(base != VK_NULL_HANDLE);
-	_dbg_assert_(light != VK_NULL_HANDLE);
-	_dbg_assert_(bone != VK_NULL_HANDLE);
-
-	DescriptorSetKey key{};
-	key.imageView_ = imageView;
-	key.sampler_ = sampler;
-	key.secondaryImageView_ = boundSecondary_;
-	key.depalImageView_ = boundDepal_;
-	key.base_ = base;
-	key.light_ = light;
-	key.bone_ = bone;
-
-	FrameData &frame = GetCurFrame();
-	// See if we already have this descriptor set cached.
-	if (!tess) { // Don't cache descriptors for HW tessellation.
-		VkDescriptorSet d;
-		if (frame.descSets.Get(key, &d)) {
-			return d;
-		}
-	}
-
-	// We just don't write to the slots we don't care about, which is fine.
-	VkWriteDescriptorSet writes[DRAW_BINDING_COUNT]{};
-	// Main texture
-	int n = 0;
-	VkDescriptorImageInfo tex[3]{};
-	if (imageView) {
-		_dbg_assert_(sampler != VK_NULL_HANDLE);
-
-		tex[0].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-		tex[0].imageView = imageView;
-		tex[0].sampler = sampler;
-		writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writes[n].pNext = nullptr;
-		writes[n].dstBinding = DRAW_BINDING_TEXTURE;
-		writes[n].pImageInfo = &tex[0];
-		writes[n].descriptorCount = 1;
-		writes[n].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
-		writes[n].dstSet = desc;
-		n++;
-	}
-
-	if (boundSecondary_) {
-		tex[1].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-		tex[1].imageView = boundSecondary_;
-		tex[1].sampler = samplerSecondaryNearest_;
-		writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writes[n].pNext = nullptr;
-		writes[n].dstBinding = DRAW_BINDING_2ND_TEXTURE;
-		writes[n].pImageInfo = &tex[1];
-		writes[n].descriptorCount = 1;
-		writes[n].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
-		writes[n].dstSet = desc;
-		n++;
-	}
-
-	if (boundDepal_) {
-		tex[2].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-		tex[2].imageView = boundDepal_;
-		tex[2].sampler = boundDepalSmoothed_ ? samplerSecondaryLinear_ : samplerSecondaryNearest_;
-		writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writes[n].pNext = nullptr;
-		writes[n].dstBinding = DRAW_BINDING_DEPAL_TEXTURE;
-		writes[n].pImageInfo = &tex[2];
-		writes[n].descriptorCount = 1;
-		writes[n].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
-		writes[n].dstSet = desc;
-		n++;
-	}
-
-	// Uniform buffer objects
-	VkDescriptorBufferInfo buf[3]{};
-	int count = 0;
-	buf[count].buffer = base;
-	buf[count].offset = 0;
-	buf[count].range = sizeof(UB_VS_FS_Base);
-	count++;
-	buf[count].buffer = light;
-	buf[count].offset = 0;
-	buf[count].range = sizeof(UB_VS_Lights);
-	count++;
-	buf[count].buffer = bone;
-	buf[count].offset = 0;
-	buf[count].range = sizeof(UB_VS_Bones);
-	count++;
-	for (int i = 0; i < count; i++) {
-		writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writes[n].pNext = nullptr;
-		writes[n].dstBinding = DRAW_BINDING_DYNUBO_BASE + i;
-		writes[n].dstArrayElement = 0;
-		writes[n].pBufferInfo = &buf[i];
-		writes[n].dstSet = desc;
-		writes[n].descriptorCount = 1;
-		writes[n].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC;
-		n++;
-	}
-
-	// Tessellation data buffer.
-	if (tess) {
-		const VkDescriptorBufferInfo *bufInfo = tessDataTransferVulkan->GetBufferInfo();
-		// Control Points
-		writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writes[n].pNext = nullptr;
-		writes[n].dstBinding = DRAW_BINDING_TESS_STORAGE_BUF;
-		writes[n].pBufferInfo = &bufInfo[0];
-		writes[n].descriptorCount = 1;
-		writes[n].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
-		writes[n].dstSet = desc;
-		n++;
-		// Weights U
-		writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writes[n].pNext = nullptr;
-		writes[n].dstBinding = DRAW_BINDING_TESS_STORAGE_BUF_WU;
-		writes[n].pBufferInfo = &bufInfo[1];
-		writes[n].descriptorCount = 1;
-		writes[n].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
-		writes[n].dstSet = desc;
-		n++;
-		// Weights V
-		writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writes[n].pNext = nullptr;
-		writes[n].dstBinding = DRAW_BINDING_TESS_STORAGE_BUF_WV;
-		writes[n].pBufferInfo = &bufInfo[2];
-		writes[n].descriptorCount = 1;
-		writes[n].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
-		writes[n].dstSet = desc;
-		n++;
-	}
-
-	VulkanContext *vulkan = (VulkanContext *)draw_->GetNativeObject(Draw::NativeObject::CONTEXT);
-	vkUpdateDescriptorSets(vulkan->GetDevice(), n, writes, 0, nullptr);
-
-	if (!tess) // Again, avoid caching when HW tessellation.
-		frame.descSets.Insert(key, desc);
-	return desc;
-}
-*/
-
 void DrawEngineVulkan::DirtyAllUBOs() {
 	baseUBOOffset = 0;
 	lightUBOOffset = 0;