Default to [X,0,0,one] for undefined texture components

src/Device/Context.cpp

@@ -28,7 +28,6 @@ namespace sw
 
 	bool booleanFaceRegister = false;
 	bool fullPixelPositionRegister = false;
-	bool colorsDefaultToZero = false;
 
 	bool forceWindowed = false;
 	bool quadLayoutEnabled = false;

src/Device/Renderer.cpp

@@ -47,7 +47,6 @@ namespace sw
 {
 	extern bool booleanFaceRegister;
 	extern bool fullPixelPositionRegister;
-	extern bool colorsDefaultToZero;
 
 	extern bool forceWindowed;
 	extern bool postBlendSRGB;
@@ -78,7 +77,6 @@ namespace sw
 		{
 			sw::booleanFaceRegister = conventions.booleanFaceRegister;
 			sw::fullPixelPositionRegister = conventions.fullPixelPositionRegister;
-			sw::colorsDefaultToZero = conventions.colorsDefaultToZero;
 			sw::exactColorRounding = exactColorRounding;
 			initialized = true;
 		}

src/Device/Renderer.hpp

@@ -59,13 +59,12 @@ namespace sw
 	extern TranscendentalPrecision rsqPrecision;
 	extern bool perspectiveCorrection;
 
-	struct Conventions
+	struct Conventions  // FIXME(capn): Eliminate. Only support Vulkan 1.1 conventions.
 	{
 		bool halfIntegerCoordinates;
 		bool symmetricNormalizedDepth;
 		bool booleanFaceRegister;
 		bool fullPixelPositionRegister;
-		bool colorsDefaultToZero;
 	};
 
 	static const Conventions OpenGL =
@@ -74,7 +73,6 @@ namespace sw
 		true,    // symmetricNormalizedDepth
 		true,    // booleanFaceRegister
 		true,    // fullPixelPositionRegister
-		true,    // colorsDefaultToZero
 	};
 
 	static const Conventions Direct3D =
@@ -83,7 +81,6 @@ namespace sw
 		false,   // symmetricNormalizedDepth
 		false,   // booleanFaceRegister
 		false,   // fullPixelPositionRegister
-		false,   // colorsDefaultToZero
 	};
 
 	struct DrawData

src/Pipeline/SamplerCore.cpp

@@ -36,8 +36,6 @@ namespace
 
 namespace sw
 {
-	extern bool colorsDefaultToZero;
-
 	SamplerCore::SamplerCore(Pointer<Byte> &constants, const Sampler::State &state) : constants(constants), state(state)
 	{
 	}
@@ -188,7 +186,6 @@ namespace sw
 		}
 
 		int componentCount = textureComponentCount();
-		float defaultColorValue = colorsDefaultToZero ? 0.0f : 1.0f;
 
 		if(state.textureFilter != FILTER_GATHER)
 		{
@@ -227,14 +224,14 @@ namespace sw
 			case VK_FORMAT_R8G8B8A8_UNORM:
 			case VK_FORMAT_R8G8B8A8_SRGB:
 			case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
-				if(componentCount < 2) c.y = Float4(defaultColorValue);
-				if(componentCount < 3) c.z = Float4(defaultColorValue);
+				if(componentCount < 2) c.y = Float4(0.0f);
+				if(componentCount < 3) c.z = Float4(0.0f);
 				if(componentCount < 4) c.w = Float4(1.0f);
 				break;
 			case VK_FORMAT_R32_SFLOAT:
-				c.y = Float4(defaultColorValue);
+				c.y = Float4(0.0f);
 			case VK_FORMAT_R32G32_SFLOAT:
-				c.z = Float4(defaultColorValue);
+				c.z = Float4(0.0f);
 				c.w = Float4(1.0f);
 			case VK_FORMAT_R32G32B32A32_SFLOAT:
 				break;