Don't perform component swizzling on a null texture.

When sampling from an incomplete texture, the OpenGL spec states that (0, 0, 0, 1) will be returned to the shader from the texture lookup function. Swizzling is only described for filtered texture values. Change-Id: Ie8a02b3b0b9e571fd2f86302e777a4ff985da022 Reviewed-on: https://swiftshader-review.googlesource.com/17488Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Don't perform component swizzling on a null texture.
57642356 · Nicolas Capens · Nicolas Capens · 3e5f6fd5 · 57642356 · 57642356
Commit 57642356 authored Feb 27, 2018 by Nicolas Capens Committed by Nicolas Capens Feb 27, 2018
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

Context.cpp src/OpenGL/libGLESv2/Context.cpp +0 -0

SamplerCore.cpp src/Shader/SamplerCore.cpp +9 -7

No files found.
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
--- a/src/Shader/SamplerCore.cpp
+++ b/src/Shader/SamplerCore.cpp
@@ -131,7 +131,9 @@ namespace sw
 				convertFixed12(c, cf);
 			}

-			if(fixed12 && !hasFloatTexture())
+			if(fixed12)
+			{
+				if(!hasFloatTexture())
 				{
 					if(state.textureFormat == FORMAT_R5G6B5)
 					{
@@ -155,7 +157,7 @@ namespace sw
 					}
 				}

-			if(fixed12 && state.textureFilter != FILTER_GATHER)
+				if(state.textureFilter != FILTER_GATHER)
 				{
 					int componentCount = textureComponentCount();
 					short defaultColorValue = colorsDefaultToZero ? 0x0000 : 0x1000;
@@ -254,13 +256,11 @@ namespace sw
 						ASSERT(false);
 					}
 				}
-		}

-		if(fixed12 &&
-		   ((state.swizzleR != SWIZZLE_RED) ||
+				if((state.swizzleR != SWIZZLE_RED) ||
 				   (state.swizzleG != SWIZZLE_GREEN) ||
 				   (state.swizzleB != SWIZZLE_BLUE) ||
-		    (state.swizzleA != SWIZZLE_ALPHA)))
+				   (state.swizzleA != SWIZZLE_ALPHA))
 				{
 					const Vector4s col(c);
 					applySwizzle(state.swizzleR, c.x, col);
@@ -268,6 +268,8 @@ namespace sw
 					applySwizzle(state.swizzleB, c.z, col);
 					applySwizzle(state.swizzleA, c.w, col);
 				}
+			}
+		}

 		return c;
 	}
@@ -484,7 +486,6 @@ namespace sw
 					ASSERT(false);
 				}
 			}
-		}

 			if((state.swizzleR != SWIZZLE_RED) ||
 			   (state.swizzleG != SWIZZLE_GREEN) ||
@@ -497,6 +498,7 @@ namespace sw
 				applySwizzle(state.swizzleB, c.z, col);
 				applySwizzle(state.swizzleA, c.w, col);
 			}
+		}

 		return c;
 	}