Merge pull request #2382 from billhollings/misc-cleanup

Minor cleanups.
KhronosGroup · Oct 18, 2024 · 4253a40 · 4253a40
2 parents 30332f3 + f03cb6b
commit 4253a40
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
@@ -2705,6 +2705,7 @@
 				WARNING_CFLAGS = (
 					"-Wreorder",
 					"-Wheader-hygiene",
+					"-Wunused-but-set-variable",
 				);
 			};
 			name = Debug;
@@ -2782,6 +2783,7 @@
 				WARNING_CFLAGS = (
 					"-Wreorder",
 					"-Wheader-hygiene",
+					"-Wunused-but-set-variable",
 				);
 			};
 			name = Release;

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
@@ -2480,7 +2480,6 @@ static MSLSamplerYCbCrRange getSpvSamplerYcbcrRangeFromVkSamplerYcbcrRange(VkSam
 
 MVKSampler::MVKSampler(MVKDevice* device, const VkSamplerCreateInfo* pCreateInfo) : MVKVulkanAPIDeviceObject(device) {
     _ycbcrConversion = NULL;
-	const VkSamplerReductionModeCreateInfo* pSampReductInfo = nullptr;
     for (const auto* next = (const VkBaseInStructure*)pCreateInfo->pNext; next; next = next->pNext) {
 		switch (next->sType) {
 			case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO_KHR: {
@@ -2489,7 +2488,6 @@ static MSLSamplerYCbCrRange getSpvSamplerYcbcrRangeFromVkSamplerYcbcrRange(VkSam
 				break;
 			}
 			case VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO: {
-				pSampReductInfo = (const VkSamplerReductionModeCreateInfo*)next;
 				break;
 			}
 			default:

diff --git a/MoltenVK/MoltenVK/Utility/MVKBitArray.h b/MoltenVK/MoltenVK/Utility/MVKBitArray.h
@@ -20,6 +20,8 @@
 
 #include "MVKFoundation.h"
 
+#include <functional>
+
 
 #pragma mark -
 #pragma mark MVKBitArray

diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
@@ -739,7 +739,11 @@
 				PRODUCT_NAME = MoltenVKShaderConverter;
 				SKIP_INSTALL = YES;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
-				WARNING_CFLAGS = "-Wreorder";
+				WARNING_CFLAGS = (
+					"-Wreorder",
+					"-Wheader-hygiene",
+					"-Wunused-but-set-variable",
+				);
 			};
 			name = Debug;
 		};
@@ -801,7 +805,11 @@
 				SKIP_INSTALL = YES;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 				VALIDATE_PRODUCT = YES;
-				WARNING_CFLAGS = "-Wreorder";
+				WARNING_CFLAGS = (
+					"-Wreorder",
+					"-Wheader-hygiene",
+					"-Wunused-but-set-variable",
+				);
 			};
 			name = Release;
 		};