commit ebebe1c72daf47e039537554b315b48490d634e4
author Geoff Lang <geofflang@chromium.org> Fri Oct 14 12:01:31 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Oct 20 03:23:41 2016 +0000
tree cc6ec43a4fee243c34c2d713f7d24cd980c3d132
parent 6899b87f8c02c358fe094a96dc1f2cf66e5fe765

Implement robust GetBufferParameter entry points.

BUG=angleproject:1354

Change-Id: I979c8768975380dba7f0b256b2729b2147ff7984
Reviewed-on: https://chromium-review.googlesource.com/399042
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/queryutils.cpp

diff --git a/src/libANGLE/queryutils.cpp b/src/libANGLE/queryutils.cpp
index 904c22f..b39d287 100644
--- a/src/libANGLE/queryutils.cpp
+++ b/src/libANGLE/queryutils.cpp
@@ -297,6 +297,40 @@
     }
 }
 
+template <typename ParamType>
+void QueryBufferParameterBase(const Buffer *buffer, GLenum pname, ParamType *params)
+{
+    ASSERT(buffer != nullptr);
+
+    switch (pname)
+    {
+        case GL_BUFFER_USAGE:
+            *params = ConvertFromGLenum<ParamType>(buffer->getUsage());
+            break;
+        case GL_BUFFER_SIZE:
+            *params = ConvertFromGLint64<ParamType>(buffer->getSize());
+            break;
+        case GL_BUFFER_ACCESS_FLAGS:
+            *params = ConvertFromGLuint<ParamType>(buffer->getAccessFlags());
+            break;
+        case GL_BUFFER_ACCESS_OES:
+            *params = ConvertFromGLenum<ParamType>(buffer->getAccess());
+            break;
+        case GL_BUFFER_MAPPED:
+            *params = ConvertFromGLboolean<ParamType>(buffer->isMapped());
+            break;
+        case GL_BUFFER_MAP_OFFSET:
+            *params = ConvertFromGLint64<ParamType>(buffer->getMapOffset());
+            break;
+        case GL_BUFFER_MAP_LENGTH:
+            *params = ConvertFromGLint64<ParamType>(buffer->getMapLength());
+            break;
+        default:
+            UNREACHABLE();
+            break;
+    }
+}
+
 }  // anonymous namespace
 
 void QueryFramebufferAttachmentParameteriv(const Framebuffer *framebuffer,
@@ -396,35 +430,12 @@
 
 void QueryBufferParameteriv(const Buffer *buffer, GLenum pname, GLint *params)
 {
-    ASSERT(buffer != nullptr);
+    QueryBufferParameterBase(buffer, pname, params);
+}
 
-    switch (pname)
-    {
-        case GL_BUFFER_USAGE:
-            *params = static_cast<GLint>(buffer->getUsage());
-            break;
-        case GL_BUFFER_SIZE:
-            *params = clampCast<GLint>(buffer->getSize());
-            break;
-        case GL_BUFFER_ACCESS_FLAGS:
-            *params = buffer->getAccessFlags();
-            break;
-        case GL_BUFFER_ACCESS_OES:
-            *params = buffer->getAccess();
-            break;
-        case GL_BUFFER_MAPPED:
-            *params = static_cast<GLint>(buffer->isMapped());
-            break;
-        case GL_BUFFER_MAP_OFFSET:
-            *params = clampCast<GLint>(buffer->getMapOffset());
-            break;
-        case GL_BUFFER_MAP_LENGTH:
-            *params = clampCast<GLint>(buffer->getMapLength());
-            break;
-        default:
-            UNREACHABLE();
-            break;
-    }
+void QueryBufferParameteri64v(const Buffer *buffer, GLenum pname, GLint64 *params)
+{
+    QueryBufferParameterBase(buffer, pname, params);
 }
 
 void QueryProgramiv(const Program *program, GLenum pname, GLint *params)