Enable PbufferTest on Linux by not advertising bindable configs

GLX Pbuffers are not bindable so implementing bindable pbuffers would have to be one of the following: - Implement Pbuffer as GLXPixmaps, with complication arising in the initialization. - Implement Pbuffers as GL textures, which would require a large change of the EGL implementation. - Fake bindable Pbuffers with glCopyTexImage2D, with obvious performance problems. BUG=angleproject:892 Change-Id: I7d9cd5a4aa2d35343244be3cbe55fc1e492f6928 Reviewed-on: https://chromium-review.googlesource.com/273056Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Enable PbufferTest on Linux by not advertising bindable configs
44aedf37 · Corentin Wallez · 5c798fe9 · 44aedf37 · 44aedf37
Commit 44aedf37 authored May 25, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

DisplayGLX.cpp src/libANGLE/renderer/gl/glx/DisplayGLX.cpp +0 -7

angle_end2end_tests.gypi src/tests/angle_end2end_tests.gypi +1 -2

No files found.
--- a/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
+++ b/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
@@ -234,8 +234,6 @@ egl::ConfigSet DisplayGLX::generateConfigs() const
    egl::ConfigSet configs;
    configIdToGLXConfig.clear();

-    // GLX_EXT_texture_from_pixmap is required for the "bind to rgb(a)" attributes
-    bool hasTextureFromPixmap = mGLX.hasExtension("GLX_EXT_texture_from_pixmap");
    bool hasSwapControl = mGLX.hasExtension("GLX_EXT_swap_control");

    int attribList[] =
@@ -321,11 +319,6 @@ egl::ConfigSet DisplayGLX::generateConfigs() const

        config.bindToTextureRGB = EGL_FALSE;
        config.bindToTextureRGBA = EGL_FALSE;
-        if (hasTextureFromPixmap)
-        {
-            config.bindToTextureRGB = getGLXFBConfigAttrib(glxConfig, GLX_BIND_TO_TEXTURE_RGB_EXT);
-            config.bindToTextureRGBA = getGLXFBConfigAttrib(glxConfig, GLX_BIND_TO_TEXTURE_RGBA_EXT);
-        }

        int glxDrawable = getGLXFBConfigAttrib(glxConfig, GLX_DRAWABLE_TYPE);
        config.surfaceType = 0 |

--- a/src/tests/angle_end2end_tests.gypi
+++ b/src/tests/angle_end2end_tests.gypi
@@ -33,6 +33,7 @@
            '<(angle_path)/src/tests/gl_tests/MaxTextureSizeTest.cpp',
            '<(angle_path)/src/tests/gl_tests/MipmapTest.cpp',
            '<(angle_path)/src/tests/gl_tests/media/pixel.inl',
+            '<(angle_path)/src/tests/gl_tests/PbufferTest.cpp',
            '<(angle_path)/src/tests/gl_tests/PBOExtensionTest.cpp',
            '<(angle_path)/src/tests/gl_tests/PointSpritesTest.cpp',
            '<(angle_path)/src/tests/gl_tests/OcclusionQueriesTest.cpp',
@@ -60,8 +61,6 @@
        ],
        'angle_end2end_tests_win_sources':
        [
-            # TODO(cwallez) for Linux, requires implementation of eglBindTexImage for pbuffers
-            '<(angle_path)/src/tests/gl_tests/PbufferTest.cpp',
            '<(angle_path)/src/tests/gl_tests/QueryDisplayAttribTest.cpp',
            # TODO(cwallez) for Linux, requires a portable implementation of threads
            '<(angle_path)/src/tests/egl_tests/EGLThreadTest.cpp',