commit fb9c05cc51d010a298b451fd74805125d78b9074
author Lingfeng Yang <lfy@google.com> Thu Jun 27 11:23:34 2019 -0700
committer Lingfeng Yang <lfy@google.com> Fri Jun 28 00:47:40 2019 +0000
tree 26065e3f28140c17e771c6d5253b20c6170b8c76
parent 762741beb99d1788de448e17961ad0cbe896d5f8

Allow 3d texture layers for framebuffer blit

b/135141616

Change-Id: Ia3c804c0bef7a000a54359d24dcd8bacc063a121
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/33508
Tested-by: Lingfeng Yang <lfy@google.com>
Kokoro-Presubmit: Lingfeng Yang <lfy@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/libGLESv2/Context.cpp

diff --git a/src/OpenGL/libGLESv2/Context.cpp b/src/OpenGL/libGLESv2/Context.cpp
index 9f255cc..9047cb6 100644
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -4180,8 +4180,8 @@
 	{
 		GLenum readColorbufferType = readFramebuffer->getReadBufferType();
 		GLenum drawColorbufferType = drawFramebuffer->getColorbufferType(0);
-		const bool validReadType = readColorbufferType == GL_TEXTURE_2D || readColorbufferType == GL_TEXTURE_RECTANGLE_ARB || Framebuffer::IsRenderbuffer(readColorbufferType);
-		const bool validDrawType = drawColorbufferType == GL_TEXTURE_2D || drawColorbufferType == GL_TEXTURE_RECTANGLE_ARB || Framebuffer::IsRenderbuffer(drawColorbufferType);
+		const bool validReadType = readColorbufferType == GL_TEXTURE_2D || readColorbufferType == GL_TEXTURE_RECTANGLE_ARB || readColorbufferType == GL_TEXTURE_2D_ARRAY || readColorbufferType == GL_TEXTURE_3D || Framebuffer::IsRenderbuffer(readColorbufferType);
+		const bool validDrawType = drawColorbufferType == GL_TEXTURE_2D || drawColorbufferType == GL_TEXTURE_RECTANGLE_ARB || readColorbufferType == GL_TEXTURE_2D_ARRAY || readColorbufferType == GL_TEXTURE_3D || Framebuffer::IsRenderbuffer(drawColorbufferType);
 		if(!validReadType || !validDrawType)
 		{
 			return error(GL_INVALID_OPERATION);