commit 1c462b340845dd4c5759bced9f71e79c4401fc01
author Nicolas Capens <capn@google.com> Thu May 02 01:53:52 2019 -0400
committer Nicolas Capens <nicolascapens@google.com> Thu May 02 19:19:25 2019 +0000
tree 42dc5c9dbded915b97d9c417f3240b1b329d2eb7
parent 1f618582c09bfd470c19da9fa79c73ded7b5fedd

Enable 3D texture sampling

Bug: b/129523279
Test: dEQP-VK.texture.*
Test: dEQP-VK.glsl.texture_functions.*
Change-Id: I12991a2538edec596eedc60d5a94cc3cabfc901b
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/30432
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Pipeline/SpirvShaderSampling.cpp

diff --git a/src/Pipeline/SpirvShaderSampling.cpp b/src/Pipeline/SpirvShaderSampling.cpp
index 46bae61..a2dcadb 100644
--- a/src/Pipeline/SpirvShaderSampling.cpp
+++ b/src/Pipeline/SpirvShaderSampling.cpp
@@ -156,7 +156,7 @@
 	{
 	case VK_IMAGE_VIEW_TYPE_1D:         return TEXTURE_1D;
 	case VK_IMAGE_VIEW_TYPE_2D:         return TEXTURE_2D;
-//	case VK_IMAGE_VIEW_TYPE_3D:         return TEXTURE_3D;
+	case VK_IMAGE_VIEW_TYPE_3D:         return TEXTURE_3D;
 	case VK_IMAGE_VIEW_TYPE_CUBE:       return TEXTURE_CUBE;
 //	case VK_IMAGE_VIEW_TYPE_1D_ARRAY:   return TEXTURE_1D_ARRAY;
 	case VK_IMAGE_VIEW_TYPE_2D_ARRAY:   return TEXTURE_2D_ARRAY;
@@ -224,7 +224,7 @@
 		break;
 	case VK_IMAGE_VIEW_TYPE_1D:
 	case VK_IMAGE_VIEW_TYPE_2D:
-//	case VK_IMAGE_VIEW_TYPE_3D:
+	case VK_IMAGE_VIEW_TYPE_3D:
 		break;
 //	case VK_IMAGE_VIEW_TYPE_1D_ARRAY:
 		break;
@@ -253,7 +253,7 @@
 		return ADDRESSING_SEAMLESS;
 	case VK_IMAGE_VIEW_TYPE_1D:
 	case VK_IMAGE_VIEW_TYPE_2D:
-//	case VK_IMAGE_VIEW_TYPE_3D:
+	case VK_IMAGE_VIEW_TYPE_3D:
 //	case VK_IMAGE_VIEW_TYPE_1D_ARRAY:
 	case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
 		break;