Revert "Merge branch 'google:master' into release"

This reverts commit 15eea27, reversing
changes made to 124cfeb.

CMakeLists.txt

@@ -84,17 +84,6 @@ if(CMAKE_OSX_ARCHITECTURES)
     endif()
 endif()
 
-# Cross compiling with `cmake -A <arch>`.
-if(CMAKE_GENERATOR_PLATFORM)
-    if(CMAKE_GENERATOR_PLATFORM MATCHES "^(Win32|win32|X86|x86)$")
-        set(ARCH "x86")
-    elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^(Win64|win64|X64|x64)$")
-        set(ARCH "x86_64")
-    elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^(ARM64|Arm64|arm64)$")
-        set(ARCH "aarch64")
-    endif()
-endif()
-
 set(CMAKE_MACOSX_RPATH TRUE)
 
 if ((CMAKE_GENERATOR MATCHES "Visual Studio") AND (CMAKE_GENERATOR_TOOLSET STREQUAL ""))

src/Device/Context.cpp

@@ -315,19 +315,19 @@ VkFormat Attachments::depthFormat() const
 
 void Inputs::initialize(const VkPipelineVertexInputStateCreateInfo *vertexInputState, const VkPipelineDynamicStateCreateInfo *dynamicStateCreateInfo)
 {
+	if(vertexInputState->flags != 0)
+	{
+		// Vulkan 1.2: "flags is reserved for future use." "flags must be 0"
+		UNSUPPORTED("vertexInputState->flags");
+	}
+
 	dynamicStateFlags = ParseInputsDynamicStateFlags(dynamicStateCreateInfo);
 
 	if(dynamicStateFlags.dynamicVertexInput)
 	{
 		return;
 	}
 
-	if(vertexInputState->flags != 0)
-	{
-		// Vulkan 1.2: "flags is reserved for future use." "flags must be 0"
-		UNSUPPORTED("vertexInputState->flags");
-	}
-
 	// Temporary in-binding-order representation of buffer strides, to be consumed below
 	// when considering attributes. TODO: unfuse buffers from attributes in backend, is old GL model.
 	uint32_t vertexStrides[MAX_VERTEX_INPUT_BINDINGS];
@@ -513,7 +513,7 @@ void VertexInputInterfaceState::initialize(const VkPipelineVertexInputStateCreat
 {
 	dynamicStateFlags = allDynamicStateFlags.vertexInputInterface;
 
-	if(vertexInputState && vertexInputState->flags != 0)
+	if(vertexInputState->flags != 0)
 	{
 		// Vulkan 1.2: "flags is reserved for future use." "flags must be 0"
 		UNSUPPORTED("vertexInputState->flags");

src/Device/Sampler.hpp

@@ -105,9 +105,6 @@ struct Sampler
 	VkSamplerYcbcrModelConversion ycbcrModel;
 	bool studioSwing;    // Narrow range
 	bool swappedChroma;  // Cb/Cr components in reverse order
-	FilterType chromaFilter;
-	VkChromaLocation chromaXOffset;
-	VkChromaLocation chromaYOffset;
 
 	float mipLodBias = 0.0f;
 	float maxAnisotropy = 0.0f;