WebGL 2: add types into glReadPixels

Source/modules/webgl/WebGL2RenderingContextBase.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/webgl/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 2097 matching lines @@
     default:
         synthesizeGLError(GL_INVALID_ENUM, "readPixels", "invalid format");
         return false;
     }
 
     switch (type) {
     case GL_UNSIGNED_BYTE:
     case GL_BYTE:
     case GL_HALF_FLOAT:
     case GL_FLOAT:
+    case GL_UNSIGNED_SHORT:
     case GL_UNSIGNED_SHORT_5_6_5:
     case GL_UNSIGNED_SHORT_4_4_4_4:
     case GL_UNSIGNED_SHORT_5_5_5_1:
+    case GL_SHORT:
     case GL_UNSIGNED_INT:
     case GL_UNSIGNED_INT_2_10_10_10_REV:
     case GL_UNSIGNED_INT_10F_11F_11F_REV:
     case GL_UNSIGNED_INT_5_9_9_9_REV:
     case GL_INT:
         break;
     default:
         synthesizeGLError(GL_INVALID_ENUM, "readPixels", "invalid type");
         return false;
     }
 
     return true;
 }
 
+DOMArrayBufferView::ViewType WebGL2RenderingContextBase::readPixelsExpectedArrayBufferViewType(GLenum type)
+{
+    DOMArrayBufferView::ViewType expectedViewType;

[Zhenyao Mo, 2015/08/14 16:07:42]

nit: you don't need this expectedViewType.  You can just return in each case,
saving one extra copying (although that's trivia).

+    switch (type) {
+    case GL_BYTE:
+        expectedViewType = DOMArrayBufferView::TypeInt8;
+        break;
+    case GL_UNSIGNED_SHORT:
+        expectedViewType = DOMArrayBufferView::TypeUint16;
+        break;
+    case GL_SHORT:
+        expectedViewType = DOMArrayBufferView::TypeInt16;
+        break;
+    case GL_HALF_FLOAT:
+        expectedViewType = DOMArrayBufferView::TypeUint16;
+        break;
+    case GL_UNSIGNED_INT:
+    case GL_UNSIGNED_INT_2_10_10_10_REV:
+    case GL_UNSIGNED_INT_10F_11F_11F_REV:
+    case GL_UNSIGNED_INT_5_9_9_9_REV:
+        expectedViewType = DOMArrayBufferView::TypeUint32;
+        break;
+    case GL_INT:
+        expectedViewType = DOMArrayBufferView::TypeInt32;
+        break;
+    default:
+        return WebGLRenderingContextBase::readPixelsExpectedArrayBufferViewType(type);
+    }
+    return expectedViewType;
+}
+
 WebGLFramebuffer* WebGL2RenderingContextBase::getFramebufferBinding(GLenum target)
 {
     if (target == GL_READ_FRAMEBUFFER)
         return m_readFramebufferBinding.get();
     return m_framebufferBinding.get();
 }
 
 bool WebGL2RenderingContextBase::validateGetFramebufferAttachmentParameterFunc(const char* functionName, GLenum target, GLenum attachment)
 {
     if (!validateFramebufferTarget(target)) {
@@ skipping 273 matching lines @@
 GLenum WebGL2RenderingContextBase::boundFramebufferColorFormat()
 {
     if (m_readFramebufferBinding && m_readFramebufferBinding->object())
         return m_readFramebufferBinding->colorBufferFormat();
     if (m_requestedAttributes.alpha())
         return GL_RGBA;
     return GL_RGB;
 }
 
 } // namespace blink