Eliminate fixed-point texture sampling

src/Pipeline/SamplerCore.cpp

@@ -19,20 +19,6 @@
 
 namespace
 {
-	void applySwizzle(sw::SwizzleType swizzle, sw::Short4& s, const sw::Vector4s& c)
-	{
-		switch(swizzle)
-		{
-		case sw::SWIZZLE_RED:	s = c.x; break;
-		case sw::SWIZZLE_GREEN: s = c.y; break;
-		case sw::SWIZZLE_BLUE:  s = c.z; break;
-		case sw::SWIZZLE_ALPHA: s = c.w; break;
-		case sw::SWIZZLE_ZERO:  s = sw::Short4(0x0000); break;
-		case sw::SWIZZLE_ONE:   s = sw::Short4(0x1000); break;
-		default: ASSERT(false);
-		}
-	}
-
 	void applySwizzle(sw::SwizzleType swizzle, sw::Float4& f, const sw::Vector4f& c)
 	{
 		switch(swizzle)
@@ -56,12 +42,7 @@ namespace sw
 	{
 	}
 
-	Vector4s SamplerCore::sampleTexture(Pointer<Byte> &texture, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Float4 &bias, Vector4f &dsx, Vector4f &dsy)
-	{
-		return sampleTexture(texture, u, v, w, q, q, dsx, dsy, (dsx), Implicit, true);
-	}
-
-	Vector4s SamplerCore::sampleTexture(Pointer<Byte> &texture, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Float4 &bias, Vector4f &dsx, Vector4f &dsy, Vector4f &offset, SamplerFunction function, bool fixed12)
+	Vector4s SamplerCore::sampleTexture(Pointer<Byte> &texture, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Float4 &bias, Vector4f &dsx, Vector4f &dsy, Vector4f &offset, SamplerFunction function)
 	{
 		Vector4s c;
 
@@ -74,23 +55,6 @@ namespace sw
 			}
 		#endif
 
-		if(state.textureType == TEXTURE_NULL)
-		{
-			c.x = Short4(0x0000);
-			c.y = Short4(0x0000);
-			c.z = Short4(0x0000);
-
-			if(fixed12)   // FIXME: Convert to fixed12 at higher level, when required
-			{
-				c.w = Short4(0x1000);
-			}
-			else
-			{
-				c.w = Short4(0xFFFFu);   // FIXME
-			}
-		}
-		else
-		{
 		Float4 uuuu = u;
 		Float4 vvvv = v;
 		Float4 wwww = w;
@@ -120,111 +84,7 @@ namespace sw
 			computeLod3D(texture, lod, uuuu, vvvv, wwww, bias.x, dsx, dsy, function);
 		}
 
-			if(!hasFloatTexture())
-			{
-				c = sampleFilter(texture, uuuu, vvvv, wwww, offset, lod, anisotropy, uDelta, vDelta, face, function);
-			}
-			else
-			{
-				Vector4f cf = sampleFloatFilter(texture, uuuu, vvvv, wwww, qqqq, offset, lod, anisotropy, uDelta, vDelta, face, function);
-
-				convertFixed12(c, cf);
-			}
-
-			if(fixed12)
-			{
-				if(!hasFloatTexture())
-				{
-					if(state.textureFormat == VK_FORMAT_R5G6B5_UNORM_PACK16)
-					{
-						c.x = MulHigh(As<UShort4>(c.x), UShort4(0x10000000 / 0xF800));
-						c.y = MulHigh(As<UShort4>(c.y), UShort4(0x10000000 / 0xFC00));
-						c.z = MulHigh(As<UShort4>(c.z), UShort4(0x10000000 / 0xF800));
-					}
-					else
-					{
-						for(int component = 0; component < textureComponentCount(); component++)
-						{
-							if(hasUnsignedTextureComponent(component))
-							{
-								c[component] = As<UShort4>(c[component]) >> 4;
-							}
-							else
-							{
-								c[component] = c[component] >> 3;
-							}
-						}
-					}
-				}
-
-				if(state.textureFilter != FILTER_GATHER)
-				{
-					int componentCount = textureComponentCount();
-					short defaultColorValue = colorsDefaultToZero ? 0x0000 : 0x1000;
-
-					switch(state.textureFormat)
-					{
-					case VK_FORMAT_R8_SNORM:
-					case VK_FORMAT_R8G8_SNORM:
-					case VK_FORMAT_R8G8B8A8_SNORM:
-					case VK_FORMAT_R8_UNORM:
-					case VK_FORMAT_R5G6B5_UNORM_PACK16:
-					case VK_FORMAT_R8G8_UNORM:
-					case VK_FORMAT_R8_SINT:
-					case VK_FORMAT_R8_UINT:
-					case VK_FORMAT_R8G8_SINT:
-					case VK_FORMAT_R8G8_UINT:
-					case VK_FORMAT_R8G8B8A8_SINT:
-					case VK_FORMAT_R8G8B8A8_UINT:
-					case VK_FORMAT_R16_SINT:
-					case VK_FORMAT_R16_UINT:
-					case VK_FORMAT_R16G16_UNORM:
-					case VK_FORMAT_R16G16_SINT:
-					case VK_FORMAT_R16G16_UINT:
-					case VK_FORMAT_R16G16B16A16_UNORM:
-					case VK_FORMAT_R16G16B16A16_SINT:
-					case VK_FORMAT_R16G16B16A16_UINT:
-					case VK_FORMAT_R32_SINT:
-					case VK_FORMAT_R32_UINT:
-					case VK_FORMAT_R32G32_SINT:
-					case VK_FORMAT_R32G32_UINT:
-					case VK_FORMAT_R32G32B32A32_SINT:
-					case VK_FORMAT_R32G32B32A32_UINT:
-					case VK_FORMAT_B8G8R8A8_UNORM:
-					case VK_FORMAT_R8G8B8A8_UNORM:
-					case VK_FORMAT_R8G8B8A8_SRGB:
-					case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
-						if(componentCount < 2) c.y = Short4(defaultColorValue);
-						if(componentCount < 3) c.z = Short4(defaultColorValue);
-						if(componentCount < 4) c.w = Short4(0x1000);
-						break;
-					case VK_FORMAT_R32_SFLOAT:
-						c.y = Short4(defaultColorValue);
-					case VK_FORMAT_R32G32_SFLOAT:
-						c.z = Short4(defaultColorValue);
-						c.w = Short4(0x1000);
-					case VK_FORMAT_R32G32B32A32_SFLOAT:
-						break;
-					default:
-						ASSERT(false);
-					}
-				}
-
-				if((state.swizzleR != SWIZZLE_RED) ||
-				   (state.swizzleG != SWIZZLE_GREEN) ||
-				   (state.swizzleB != SWIZZLE_BLUE) ||
-				   (state.swizzleA != SWIZZLE_ALPHA))
-				{
-					const Vector4s col(c);
-					applySwizzle(state.swizzleR, c.x, col);
-					applySwizzle(state.swizzleG, c.y, col);
-					applySwizzle(state.swizzleB, c.z, col);
-					applySwizzle(state.swizzleA, c.w, col);
-				}
-			}
-		}
-
-		return c;
+		return sampleFilter(texture, uuuu, vvvv, wwww, offset, lod, anisotropy, uDelta, vDelta, face, function);
 	}
 
 	Vector4f SamplerCore::sampleTextureF(Pointer<Byte> &texture, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Float4 &bias, Vector4f &dsx, Vector4f &dsy, Vector4f &offset, SamplerFunction function)
@@ -240,15 +100,6 @@ namespace sw
 			}
 		#endif
 
-		if(state.textureType == TEXTURE_NULL)
-		{
-			c.x = Float4(0.0f);
-			c.y = Float4(0.0f);
-			c.z = Float4(0.0f);
-			c.w = Float4(1.0f);
-		}
-		else
-		{
 		// FIXME: YUV is not supported by the floating point path
 		bool forceFloatFiltering = state.highPrecisionFiltering && !hasYuvFormat() && (state.textureFilter != FILTER_POINT);
 		bool seamlessCube = (state.addressingModeU == ADDRESSING_SEAMLESS);
@@ -312,7 +163,7 @@ namespace sw
 		}
 		else
 		{
-				Vector4s cs = sampleTexture(texture, u, v, w, q, bias, dsx, dsy, offset, function, false);
+			Vector4s cs = sampleTexture(texture, u, v, w, q, bias, dsx, dsy, offset, function);
 
 			if(state.textureFormat ==  VK_FORMAT_R5G6B5_UNORM_PACK16)
 			{
@@ -403,7 +254,6 @@ namespace sw
 			applySwizzle(state.swizzleB, c.z, col);
 			applySwizzle(state.swizzleA, c.w, col);
 		}
-		}
 
 		return c;
 	}
@@ -2352,32 +2202,6 @@ namespace sw
 		}
 	}
 
-	void SamplerCore::convertFixed12(Short4 &cs, Float4 &cf)
-	{
-		cs = RoundShort4(cf * Float4(0x1000));
-	}
-
-	void SamplerCore::convertFixed12(Vector4s &cs, Vector4f &cf)
-	{
-		convertFixed12(cs.x, cf.x);
-		convertFixed12(cs.y, cf.y);
-		convertFixed12(cs.z, cf.z);
-		convertFixed12(cs.w, cf.w);
-	}
-
-	void SamplerCore::convertSigned12(Float4 &cf, Short4 &cs)
-	{
-		cf = Float4(cs) * Float4(1.0f / 0x0FFE);
-	}
-
-//	void SamplerCore::convertSigned12(Vector4f &cf, Vector4s &cs)
-//	{
-//		convertSigned12(cf.x, cs.x);
-//		convertSigned12(cf.y, cs.y);
-//		convertSigned12(cf.z, cs.z);
-//		convertSigned12(cf.w, cs.w);
-//	}
-
 	void SamplerCore::convertSigned15(Float4 &cf, Short4 &cs)
 	{
 		cf = Float4(cs) * Float4(1.0f / 0x7FFF);

src/Pipeline/SamplerCore.hpp

@@ -50,12 +50,11 @@ namespace sw
 	public:
 		SamplerCore(Pointer<Byte> &constants, const Sampler::State &state);
 
-		Vector4s sampleTexture(Pointer<Byte> &texture, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Float4 &bias, Vector4f &dsx, Vector4f &dsy);
 		Vector4f sampleTextureF(Pointer<Byte> &texture, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Float4 &bias, Vector4f &dsx, Vector4f &dsy, Vector4f &offset, SamplerFunction function);
 		static Vector4f textureSize(Pointer<Byte> &mipmap, Float4 &lod);
 
 	private:
-		Vector4s sampleTexture(Pointer<Byte> &texture, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Float4 &bias, Vector4f &dsx, Vector4f &dsy, Vector4f &offset, SamplerFunction function, bool fixed12);
+		Vector4s sampleTexture(Pointer<Byte> &texture, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Float4 &bias, Vector4f &dsx, Vector4f &dsy, Vector4f &offset, SamplerFunction function);
 
 		void border(Short4 &mask, Float4 &coordinates);
 		void border(Int4 &mask, Float4 &coordinates);
@@ -87,9 +86,6 @@ namespace sw
 		void address(Float4 &uw, Int4& xyz0, Int4& xyz1, Float4& f, Pointer<Byte>& mipmap, Float4 &texOffset, Int4 &filter, int whd, AddressingMode addressingMode, SamplerFunction function);
 		Int4 computeFilterOffset(Float &lod);
 
-		void convertFixed12(Short4 &ci, Float4 &cf);
-		void convertFixed12(Vector4s &cs, Vector4f &cf);
-		void convertSigned12(Float4 &cf, Short4 &ci);
 		void convertSigned15(Float4 &cf, Short4 &ci);
 		void convertUnsigned16(Float4 &cf, Short4 &ci);
 		void sRGBtoLinear16_8_16(Short4 &c);