Skip to content

S
swiftshader
Commit d05a23da by Nicolas Capens
Options

Fix passthru of non-float texture coordinates.

Bug 18962347 Change-Id: I8976c11ef5cc0b8aeb902414b2d36e0375c57747 Reviewed-on: https://swiftshader-review.googlesource.com/1861Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent c50d35d4
Showing with 4 additions and 8 deletions
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);
}
else ASSERT(!input[TexCoord0 + textureStage[coordinate].texCoordIndex]);
hasTexture = hasTexture || (component < input[TexCoord0 + textureStage[coordinate].texCoordIndex].count);
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]))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment