commit cc6ac25e95ba23e50f768d65ce88adb4b74af41e
author Jamie Madill <jmadill@chromium.org> Wed Jan 25 12:57:21 2017 -0800
committer Commit Bot <commit-bot@chromium.org> Wed Jan 25 22:34:45 2017 +0000
tree 31c1cebcddfbb597282985708e9ed67fd68f4b47
parent d73f852f8d3332089682b35723f8849c031acd4d

GLES: Expose OES_mapbuffer in GLES2 on GLES3.

This extension is mandatory for EXT_map_buffer_range support. We can
emulate it using GLES 3.0 core map functionality.

BUG=angleproject:1751

Change-Id: Idba09ce7276603d5556039f4a49aa0b87cae22aa
Reviewed-on: https://chromium-review.googlesource.com/431826
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/tests/gl_tests/SimpleOperationTest.cpp

diff --git a/src/tests/gl_tests/SimpleOperationTest.cpp b/src/tests/gl_tests/SimpleOperationTest.cpp
index b11fb9f..4806abd 100644
--- a/src/tests/gl_tests/SimpleOperationTest.cpp
+++ b/src/tests/gl_tests/SimpleOperationTest.cpp
@@ -10,6 +10,9 @@
 
 #include <vector>
 
+#include "random_utils.h"
+#include "test_utils/gl_raii.h"
+
 using namespace angle;
 
 namespace
@@ -27,8 +30,28 @@
         setConfigBlueBits(8);
         setConfigAlphaBits(8);
     }
+
+    void verifyBuffer(const std::vector<uint8_t> &data, GLenum binding);
 };
 
+void SimpleOperationTest::verifyBuffer(const std::vector<uint8_t> &data, GLenum binding)
+{
+    if (!extensionEnabled("GL_EXT_map_buffer_range"))
+    {
+        return;
+    }
+
+    uint8_t *mapPointer =
+        static_cast<uint8_t *>(glMapBufferRangeEXT(GL_ARRAY_BUFFER, 0, 1024, GL_MAP_READ_BIT));
+    ASSERT_GL_NO_ERROR();
+
+    std::vector<uint8_t> readbackData(data.size());
+    memcpy(readbackData.data(), mapPointer, data.size());
+    glUnmapBufferOES(GL_ARRAY_BUFFER);
+
+    EXPECT_EQ(data, readbackData);
+}
+
 TEST_P(SimpleOperationTest, CompileVertexShader)
 {
     const std::string source = SHADER_SOURCE
@@ -154,46 +177,47 @@
 
 TEST_P(SimpleOperationTest, BufferDataWithData)
 {
-    GLuint buffer;
-    glGenBuffers(1, &buffer);
-    glBindBuffer(GL_ARRAY_BUFFER, buffer);
+    GLBuffer buffer;
+    glBindBuffer(GL_ARRAY_BUFFER, buffer.get());
 
     std::vector<uint8_t> data(1024);
+    FillVectorWithRandomUBytes(&data);
     glBufferData(GL_ARRAY_BUFFER, data.size(), &data[0], GL_STATIC_DRAW);
 
-    glDeleteBuffers(1, &buffer);
+    verifyBuffer(data, GL_ARRAY_BUFFER);
 
     EXPECT_GL_NO_ERROR();
 }
 
 TEST_P(SimpleOperationTest, BufferDataWithNoData)
 {
-    GLuint buffer;
-    glGenBuffers(1, &buffer);
-    glBindBuffer(GL_ARRAY_BUFFER, buffer);
+    GLBuffer buffer;
+    glBindBuffer(GL_ARRAY_BUFFER, buffer.get());
     glBufferData(GL_ARRAY_BUFFER, 1024, nullptr, GL_STATIC_DRAW);
-    glDeleteBuffers(1, &buffer);
 
     EXPECT_GL_NO_ERROR();
 }
 
 TEST_P(SimpleOperationTest, BufferSubData)
 {
-    GLuint buffer;
-    glGenBuffers(1, &buffer);
-    glBindBuffer(GL_ARRAY_BUFFER, buffer);
+    GLBuffer buffer;
+    glBindBuffer(GL_ARRAY_BUFFER, buffer.get());
 
-    const size_t bufferSize = 1024;
+    constexpr size_t bufferSize = 1024;
+    std::vector<uint8_t> data(bufferSize);
+    FillVectorWithRandomUBytes(&data);
+
     glBufferData(GL_ARRAY_BUFFER, bufferSize, nullptr, GL_STATIC_DRAW);
 
-    const size_t subDataCount = 16;
-    std::vector<uint8_t> data(bufferSize / subDataCount);
+    constexpr size_t subDataCount = 16;
+    constexpr size_t sliceSize    = bufferSize / subDataCount;
     for (size_t i = 0; i < subDataCount; i++)
     {
-        glBufferSubData(GL_ARRAY_BUFFER, data.size() * i, data.size(), &data[0]);
+        size_t offset = i * sliceSize;
+        glBufferSubData(GL_ARRAY_BUFFER, offset, sliceSize, &data[offset]);
     }
 
-    glDeleteBuffers(1, &buffer);
+    verifyBuffer(data, GL_ARRAY_BUFFER);
 
     EXPECT_GL_NO_ERROR();
 }