commit 30aa1a9f438374a771cc789eddb4d2fd21860305
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:03:13 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:03:13 2013 +0000
tree ed6add1ba4f833f17b93957ea6b99284c0b8db59
parent 44b2768fcceb1989b268bb88698ac58cb33debcb

Implemented mipmap generation for 2D array textures.

TRAC #22927

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2276 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index abf93b1..cc7155f 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -3201,6 +3201,23 @@
                     break;
                 }
 
+                case GL_TEXTURE_2D_ARRAY:
+                  {
+                      if (context->getClientVersion() < 3)
+                      {
+                          return gl::error(GL_INVALID_ENUM);
+                      }
+
+                      gl::Texture2DArray *tex2darr = context->getTexture2DArray();
+                      if (tex2darr->isCompressed(0))
+                      {
+                          return gl::error(GL_INVALID_OPERATION);
+                      }
+
+                      tex2darr->generateMipmaps();
+                      break;
+                  }
+
               default:
                 return gl::error(GL_INVALID_ENUM);
             }