Recorrect feature requirements in projects

Signed-off-by: Tobias Frisch <[email protected]>
TheJackiMonster · Jul 19, 2024 · e3f0db2 · e3f0db2
1 parent f920668
commit e3f0db2
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 56 deletions.
diff --git a/projects/fire_works/src/main.cpp b/projects/fire_works/src/main.cpp
@@ -201,14 +201,6 @@ int main(int argc, const char **argv) {
 	features.requireFeature([](vk::PhysicalDeviceFeatures& features) {
 		features.setGeometryShader(true);
 	});
-
-	features.requireExtensionFeature<vk::PhysicalDeviceDescriptorIndexingFeatures>(
-			VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,
-			[](vk::PhysicalDeviceDescriptorIndexingFeatures& features) {
-				features.setDescriptorBindingPartiallyBound(true);
-				features.setDescriptorBindingVariableDescriptorCount(true);
-			}
-	);
 
 	vkcv::Core core = vkcv::Core::create(
 		"Firework",

diff --git a/projects/indirect_dispatch/src/App.cpp b/projects/indirect_dispatch/src/App.cpp
@@ -48,14 +48,6 @@ static vkcv::Features getAppFeatures() {
 				features.setShaderFloat16(true);
 			}
 	);
-
-	features.requireExtensionFeature<vk::PhysicalDeviceDescriptorIndexingFeatures>(
-			VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,
-			[](vk::PhysicalDeviceDescriptorIndexingFeatures& features) {
-				features.setDescriptorBindingPartiallyBound(true);
-				features.setDescriptorBindingVariableDescriptorCount(true);
-			}
-	);
 
 	features.tryExtensionFeature<vk::PhysicalDeviceCoherentMemoryFeaturesAMD>(
 			VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME,

diff --git a/projects/mesh_shader/src/main.cpp b/projects/mesh_shader/src/main.cpp
@@ -90,14 +90,6 @@ int main(int argc, const char** argv) {
 			}
 	);
 
-	features.requireExtensionFeature<vk::PhysicalDeviceDescriptorIndexingFeatures>(
-			VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,
-			[](vk::PhysicalDeviceDescriptorIndexingFeatures& features) {
-				features.setDescriptorBindingPartiallyBound(true);
-				features.setDescriptorBindingVariableDescriptorCount(true);
-			}
-	);
-
 	vkcv::Core core = vkcv::Core::create(
 		applicationName,
 		VK_MAKE_VERSION(0, 0, 1),

diff --git a/projects/particle_simulation/src/main.cpp b/projects/particle_simulation/src/main.cpp
@@ -19,13 +19,6 @@ int main(int argc, const char **argv) {
 
     vkcv::Features features;
 	features.requireExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
-    features.requireExtensionFeature<vk::PhysicalDeviceDescriptorIndexingFeatures>(
-			VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,
-			[](vk::PhysicalDeviceDescriptorIndexingFeatures& features) {
-				features.setDescriptorBindingPartiallyBound(true);
-				features.setDescriptorBindingVariableDescriptorCount(true);
-			}
-	);
 
     vkcv::Core core = vkcv::Core::create(
             applicationName,

diff --git a/projects/path_tracer/src/main.cpp b/projects/path_tracer/src/main.cpp
@@ -50,14 +50,6 @@ int main(int argc, const char** argv) {
 	vkcv::Features features;
 	features.requireExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
 
-	features.requireExtensionFeature<vk::PhysicalDeviceDescriptorIndexingFeatures>(
-			VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,
-			[](vk::PhysicalDeviceDescriptorIndexingFeatures& features) {
-				features.setDescriptorBindingPartiallyBound(true);
-				features.setDescriptorBindingVariableDescriptorCount(true);
-			}
-	);
-
 	vkcv::Core core = vkcv::Core::create(
 		applicationName,
 		VK_MAKE_VERSION(0, 0, 1),

diff --git a/projects/ray_tracer/src/main.cpp b/projects/ray_tracer/src/main.cpp
@@ -38,14 +38,6 @@ int main(int argc, const char** argv) {
 	vkcv::Features features;
 	features.requireExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
 
-	features.requireExtensionFeature<vk::PhysicalDeviceDescriptorIndexingFeatures>(
-			VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,
-			[](vk::PhysicalDeviceDescriptorIndexingFeatures& features) {
-				features.setDescriptorBindingPartiallyBound(true);
-				features.setDescriptorBindingVariableDescriptorCount(true);
-			}
-	);
-
 	vkcv::Core core = vkcv::Core::create(
 		applicationName,
 		VK_MAKE_VERSION(0, 0, 1),

diff --git a/projects/sph/src/main.cpp b/projects/sph/src/main.cpp
@@ -19,14 +19,6 @@ int main(int argc, const char **argv) {
     vkcv::Features features;
 	features.requireExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
 
-	features.requireExtensionFeature<vk::PhysicalDeviceDescriptorIndexingFeatures>(
-			VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,
-			[](vk::PhysicalDeviceDescriptorIndexingFeatures& features) {
-				features.setDescriptorBindingPartiallyBound(true);
-				features.setDescriptorBindingVariableDescriptorCount(true);
-			}
-	);
-
     // creating core object that will handle all vulkan objects
     vkcv::Core core = vkcv::Core::create(
         applicationName,

diff --git a/src/vkcv/ShaderProgram.cpp b/src/vkcv/ShaderProgram.cpp
@@ -125,7 +125,6 @@ namespace vkcv {
 		for (uint32_t i = 0; i < res->size(); i++) {
 			const spirv_cross::Resource &u = (*res)[i];
 			const spirv_cross::SPIRType &base_type = comp.get_type(u.base_type_id);
-			const spirv_cross::SPIRType &type = comp.get_type(u.type_id);
 
 			uint32_t setID = comp.get_decoration(u.id, spv::DecorationDescriptorSet);
 			uint32_t bindingID = comp.get_decoration(u.id, spv::DecorationBinding);