GL: Expose PBO extensions

Ensure WebGLCompatibilityTest.EnablePixelBufferObjectExtensions functions in surfaceless mode by creating a framebuffer to do the test glReadPixels from. BUG=angleproject:4079 Change-Id: I109b3cdeb85625a6a97832ecf8130d53a4074af9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1893058Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>

GL: Expose PBO extensions
19dd51b0 · Geoff Lang · Commit Bot · f8b5a4c8 · 19dd51b0 · 19dd51b0
Commit 19dd51b0 authored Nov 04, 2019 by Geoff Lang Committed by Commit Bot Nov 06, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 0 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +5 -0

WebGLCompatibilityTest.cpp src/tests/gl_tests/WebGLCompatibilityTest.cpp +11 -0

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1108,6 +1108,11 @@ void GenerateCaps(const FunctionsGL *functions,
    extensions->readFormatBGRA   = functions->isAtLeastGL(gl::Version(1, 2)) ||
                                 functions->hasGLExtension("GL_EXT_bgra") ||
                                 functions->hasGLESExtension("GL_EXT_read_format_bgra");
+    extensions->pixelBufferObject = functions->isAtLeastGL(gl::Version(2, 1)) ||
+                                    functions->isAtLeastGLES(gl::Version(3, 0)) ||
+                                    functions->hasGLExtension("GL_ARB_pixel_buffer_object") ||
+                                    functions->hasGLExtension("GL_EXT_pixel_buffer_object") ||
+                                    functions->hasGLESExtension("GL_NV_pixel_buffer_object");
    extensions->mapBuffer = functions->isAtLeastGL(gl::Version(1, 5)) ||
                            functions->isAtLeastGLES(gl::Version(3, 0)) ||
                            functions->hasGLESExtension("GL_OES_mapbuffer");

--- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
@@ -584,6 +584,17 @@ TEST_P(WebGLCompatibilityTest, EnablePixelBufferObjectExtensions)
        glRequestExtensionANGLE("GL_NV_pixel_buffer_object");
        EXPECT_GL_NO_ERROR();

+        // Create a framebuffer to read from
+        GLRenderbuffer renderbuffer;
+        glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
+        glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA4, 1, 1);
+
+        GLFramebuffer fbo;
+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
+                                  renderbuffer);
+        EXPECT_GL_NO_ERROR();
+
        glBindBuffer(GL_PIXEL_PACK_BUFFER, buffer);
        EXPECT_GL_NO_ERROR();