commit 838fe3db1152637b7cf18429fd0ea38ac5404d63
author Nicolas Capens <capn@google.com> Thu Mar 29 14:50:24 2018 -0400
committer Nicolas Capens <nicolascapens@google.com> Wed Sep 05 21:33:51 2018 +0000
tree 4c8fe0238a88c30ac0d51826099249e3df6f2912
parent d1ed57e6942ec88e2c925d602b3830c7dc3bf213

Remove quad-layout depth formats from sampler.

We can't sample from buffers with linear layout.

Bug swiftshader:104

Change-Id: I622786e9dac8faafeb7ef1745f02587bf43d67bd
Reviewed-on: https://swiftshader-review.googlesource.com/18168
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/Shader/SamplerCore.cpp

diff --git a/src/Shader/SamplerCore.cpp b/src/Shader/SamplerCore.cpp
index 6ede6f1..8a2aa39 100644
--- a/src/Shader/SamplerCore.cpp
+++ b/src/Shader/SamplerCore.cpp
@@ -242,8 +242,6 @@
 						c.w = Short4(0x1000);
 					case FORMAT_A32B32G32R32F:
 						break;
-					case FORMAT_D32F:
-					case FORMAT_D32FS8:
 					case FORMAT_D32F_LOCKABLE:
 					case FORMAT_D32FS8_TEXTURE:
 					case FORMAT_D32F_SHADOW:
@@ -472,8 +470,6 @@
 					c.w = Float4(1.0f);
 				case FORMAT_A32B32G32R32F:
 					break;
-				case FORMAT_D32F:
-				case FORMAT_D32FS8:
 				case FORMAT_D32F_LOCKABLE:
 				case FORMAT_D32FS8_TEXTURE:
 				case FORMAT_D32F_SHADOW:
@@ -2640,8 +2636,6 @@
 		case FORMAT_R8:
 		case FORMAT_L8:
 		case FORMAT_A8L8:
-		case FORMAT_D32F:
-		case FORMAT_D32FS8:
 		case FORMAT_D32F_LOCKABLE:
 		case FORMAT_D32FS8_TEXTURE:
 		case FORMAT_D32F_SHADOW:
@@ -2708,8 +2702,6 @@
 		case FORMAT_X32B32G32R32F:
 		case FORMAT_A32B32G32R32F:
 		case FORMAT_X32B32G32R32F_UNSIGNED:
-		case FORMAT_D32F:
-		case FORMAT_D32FS8:
 		case FORMAT_D32F_LOCKABLE:
 		case FORMAT_D32FS8_TEXTURE:
 		case FORMAT_D32F_SHADOW:
@@ -2791,8 +2783,6 @@
 		case FORMAT_R8:
 		case FORMAT_L8:
 		case FORMAT_A8L8:
-		case FORMAT_D32F:
-		case FORMAT_D32FS8:
 		case FORMAT_D32F_LOCKABLE:
 		case FORMAT_D32FS8_TEXTURE:
 		case FORMAT_D32F_SHADOW:
@@ -2873,8 +2863,6 @@
 		case FORMAT_R8:
 		case FORMAT_L8:
 		case FORMAT_A8L8:
-		case FORMAT_D32F:
-		case FORMAT_D32FS8:
 		case FORMAT_D32F_LOCKABLE:
 		case FORMAT_D32FS8_TEXTURE:
 		case FORMAT_D32F_SHADOW:
@@ -2947,8 +2935,6 @@
 		case FORMAT_R8:
 		case FORMAT_L8:
 		case FORMAT_A8L8:
-		case FORMAT_D32F:
-		case FORMAT_D32FS8:
 		case FORMAT_D32F_LOCKABLE:
 		case FORMAT_D32FS8_TEXTURE:
 		case FORMAT_D32F_SHADOW:
@@ -3019,8 +3005,6 @@
 		case FORMAT_R8:             return component < 1;
 		case FORMAT_L8:             return component < 1;
 		case FORMAT_A8L8:           return component < 1;
-		case FORMAT_D32F:           return false;
-		case FORMAT_D32FS8:         return false;
 		case FORMAT_D32F_LOCKABLE:  return false;
 		case FORMAT_D32FS8_TEXTURE: return false;
 		case FORMAT_D32F_SHADOW:    return false;