Fix passthru of non-float texture coordinates.

Bug 18962347 Change-Id: I8976c11ef5cc0b8aeb902414b2d36e0375c57747 Reviewed-on: https://swiftshader-review.googlesource.com/1861Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Fix passthru of non-float texture coordinates.
d05a23da · Nicolas Capens · c50d35d4 · d05a23da
Commit d05a23da authored Jan 29, 2015 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

Context.cpp src/Renderer/Context.cpp +4 -8

No files found.
--- a/src/Renderer/Context.cpp
+++ b/src/Renderer/Context.cpp
@@ -536,11 +536,7 @@ namespace sw
 			switch(texGen[coordinate])
 			{
 			case TEXGEN_PASSTHRU:
-				if(input[TexCoord0 + textureStage[coordinate].texCoordIndex].type == STREAMTYPE_FLOAT)
+				hasTexture = hasTexture || (component < input[TexCoord0 + textureStage[coordinate].texCoordIndex].count);
-				{
-					hasTexture = hasTexture || (component < input[TexCoord0 + textureStage[coordinate].texCoordIndex].count);
-				}
-				else ASSERT(!input[TexCoord0 + textureStage[coordinate].texCoordIndex]);
 				break;
 			case TEXGEN_NORMAL:
 				hasTexture = hasTexture || (component <= 2);
@@ -652,7 +648,7 @@ namespace sw
 			return MATERIAL_MATERIAL;
 		}
-		if(specularMaterialSource == MATERIAL_MATERIAL || !colorVertexEnable ||
+		if(!colorVertexEnable ||
 		   (specularMaterialSource == MATERIAL_COLOR1 && !input[Color0]) ||
 		   (specularMaterialSource == MATERIAL_COLOR2 && !input[Color1]))
 		{
@@ -669,7 +665,7 @@ namespace sw
 			return MATERIAL_MATERIAL;
 		}
-		if(ambientMaterialSource == MATERIAL_MATERIAL || !colorVertexEnable ||
+		if(!colorVertexEnable ||
 		   (ambientMaterialSource == MATERIAL_COLOR1 && !input[Color0]) ||
 		   (ambientMaterialSource == MATERIAL_COLOR2 && !input[Color1]))
 		{
@@ -686,7 +682,7 @@ namespace sw
 			return MATERIAL_MATERIAL;
 		}
-		if(emissiveMaterialSource == MATERIAL_MATERIAL || !colorVertexEnable ||
+		if(!colorVertexEnable ||
 		   (emissiveMaterialSource == MATERIAL_COLOR1 && !input[Color0]) ||
 		   (emissiveMaterialSource == MATERIAL_COLOR2 && !input[Color1]))
 		{