From d98514b6a944f4ef8f008c7381f65563609fd149 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Wed, 12 Oct 2016 13:22:41 -0700 Subject: [PATCH] Get rid of DEQP_SUPPORT_GLES2, _GLES3, _EGL, _OPENGL Common code for those APIs don't need platform headers or implementation libraries to be present build- nor run-time. It then makes sense to always enable all relevant code paths on build time and have them gracefully fail on run-time instead if driver libraries can not be found. Change-Id: I31f417f368206b9ee0d7cadcc0cf5e227bda125f --- Android.mk | 3 -- CMakeLists.txt | 72 ++++++------------------- framework/egl/egluStaticESLibrary.cpp | 4 +- framework/egl/wrapper/eglwLibrary.cpp | 4 +- framework/opengl/simplereference/CMakeLists.txt | 10 +--- framework/opengl/wrapper/glwInitES20Direct.cpp | 4 +- framework/opengl/wrapper/glwInitES30Direct.cpp | 4 +- framework/platform/CMakeLists.txt | 17 +++--- framework/platform/X11/tcuX11Platform.cpp | 20 ++----- modules/egl/CMakeLists.txt | 6 +-- scripts/cppcheck.py | 4 -- targets/android/android.cmake | 17 +++--- targets/default/default.cmake | 6 --- targets/ios/ios.cmake | 3 -- targets/null/null.cmake | 6 +-- targets/osx/osx.cmake | 2 - targets/raspi/raspi.cmake | 2 - targets/wayland/wayland.cmake | 6 +-- targets/win32_wgl/win32_wgl.cmake | 6 +-- targets/x11_egl/x11_egl.cmake | 5 -- targets/x11_egl_glx/x11_egl_glx.cmake | 4 -- targets/x11_glx/x11_glx.cmake | 4 -- 22 files changed, 49 insertions(+), 160 deletions(-) diff --git a/Android.mk b/Android.mk index a1d9d3a..0c2bca7 100644 --- a/Android.mk +++ b/Android.mk @@ -954,10 +954,7 @@ LOCAL_C_INCLUDES := \ $(deqp_dir)/external/vulkancts/modules/vulkan/wsi deqp_compile_flags := \ - -DDEQP_SUPPORT_EGL=1 \ -DDEQP_SUPPORT_GLES1=1 \ - -DDEQP_SUPPORT_GLES2=1 \ - -DDEQP_SUPPORT_GLES3=1 \ -DDE_ANDROID_API=9 \ -D_XOPEN_SOURCE=600 \ -DDEQP_TARGET_NAME=\"android\" \ diff --git a/CMakeLists.txt b/CMakeLists.txt index da4b5bf..1ecdd52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,29 +15,20 @@ add_definitions(-DDE_ASSERT_FAILURE_CALLBACK) # dEQP-specific configuration. Target file should override these. set(DEQP_TARGET_NAME "UNKNOWN") # Target name -set(DEQP_SUPPORT_GLES1 OFF) # Is GLESv1 supported -set(DEQP_GLES1_LIBRARIES ) # GLESv1 libraries - -set(DEQP_SUPPORT_GLES2 OFF) # Is GLESv2 supported set(DEQP_GLES2_LIBRARIES ) # GLESv2 libraries. If empty, run-time linking is used - -set(DEQP_SUPPORT_GLES3 OFF) # Is GLESv3 supported set(DEQP_GLES3_LIBRARIES ) # GLESv3 libraries. If empty, run-time linking is used +set(DEQP_EGL_LIBRARIES ) # EGL libraries -set(DEQP_SUPPORT_VG OFF) # Is VG supported +# Legacy APIs that don't use run-time loading +set(DEQP_SUPPORT_GLES1 OFF) # Is GLESv1 supported +set(DEQP_GLES1_LIBRARIES ) # GLESv1 libraries +set(DEQP_SUPPORT_VG OFF) # Is OpenVG supported set(DEQP_VG_LIBRARIES ) # VG libraries -set(DEQP_SUPPORT_EGL OFF) # Is EGL supported -set(DEQP_EGL_LIBRARIES ) # EGL libraries - -set(DEQP_SUPPORT_GLX OFF) # Is GLX supported -set(DEQP_SUPPORT_WGL OFF) # Is WGL supported +set(DEQP_SUPPORT_GLX OFF) # Is GLX supported \todo [2016-10-12 pyry] X11 specific - move to framework/platform/ set(DEQP_PLATFORM_LIBRARIES ) # Other platform libraries -set(DEQP_SUPPORT_OPENGL OFF) # Is OpenGL supported on platform - # \note OpenGL is always loaded on run-time - set(DEQP_PLATFORM_COPY_LIBRARIES ) # Libraries / binaries that need to be copied to binary directory # Delibs include directories @@ -86,18 +77,12 @@ include_directories(${PNG_INCLUDE_PATH}) message(STATUS "DEQP_TARGET_NAME = ${DEQP_TARGET_NAME}") message(STATUS "DEQP_SUPPORT_GLES1 = ${DEQP_SUPPORT_GLES1}") message(STATUS "DEQP_GLES1_LIBRARIES = ${DEQP_GLES1_LIBRARIES}") -message(STATUS "DEQP_SUPPORT_GLES2 = ${DEQP_SUPPORT_GLES2}") message(STATUS "DEQP_GLES2_LIBRARIES = ${DEQP_GLES2_LIBRARIES}") -message(STATUS "DEQP_SUPPORT_GLES3 = ${DEQP_SUPPORT_GLES3}") message(STATUS "DEQP_GLES3_LIBRARIES = ${DEQP_GLES3_LIBRARIES}") message(STATUS "DEQP_SUPPORT_VG = ${DEQP_SUPPORT_VG}") message(STATUS "DEQP_VG_LIBRARIES = ${DEQP_VG_LIBRARIES}") -message(STATUS "DEQP_SUPPORT_EGL = ${DEQP_SUPPORT_EGL}") message(STATUS "DEQP_EGL_LIBRARIES = ${DEQP_EGL_LIBRARIES}") -message(STATUS "DEQP_SUPPORT_OPENGL = ${DEQP_SUPPORT_OPENGL}") message(STATUS "DEQP_PLATFORM_LIBRARIES = ${DEQP_PLATFORM_LIBRARIES}") -message(STATUS "DEQP_SUPPORT_WGL = ${DEQP_SUPPORT_WGL}") -message(STATUS "DEQP_SUPPORT_GLX = ${DEQP_SUPPORT_GLX}") # Defines add_definitions(-DDEQP_TARGET_NAME="${DEQP_TARGET_NAME}") @@ -106,60 +91,35 @@ if (DEQP_SUPPORT_GLES1) add_definitions(-DDEQP_SUPPORT_GLES1=1) endif () -if (DEQP_SUPPORT_GLES2) - add_definitions(-DDEQP_SUPPORT_GLES2=1) -endif () - -if (DEQP_SUPPORT_GLES3) - add_definitions(-DDEQP_SUPPORT_GLES3=1) -endif () - if (DEQP_SUPPORT_VG) add_definitions(-DDEQP_SUPPORT_VG=1) endif () -if (DEQP_SUPPORT_EGL) - add_definitions(-DDEQP_SUPPORT_EGL=1) +# Entry points loaded on run-time? +if (NOT DEFINED DEQP_GLES2_LIBRARIES) + add_definitions(-DDEQP_GLES2_RUNTIME_LOAD=1) endif () -if (DEQP_SUPPORT_OPENGL) - add_definitions(-DDEQP_SUPPORT_OPENGL=1) +if (NOT DEFINED DEQP_GLES3_LIBRARIES) + add_definitions(-DDEQP_GLES3_RUNTIME_LOAD=1) endif () -if (DEQP_SUPPORT_WGL) - add_definitions(-DDEQP_SUPPORT_WGL=1) +if (NOT DEFINED DEQP_EGL_LIBRARIES) + add_definitions(-DDEQP_EGL_RUNTIME_LOAD=1) endif () -if (DEQP_SUPPORT_GLX) - add_definitions(-DDEQP_SUPPORT_GLX=1) -endif () +# OpenGL entry points are always loaded on run-time +add_definitions(-DDEQP_OPENGL_RUNTIME_LOAD=1) -# Check runtime linking support +# Legacy APIs that don't support run-time loading if (DEQP_SUPPORT_GLES1 AND NOT DEFINED DEQP_GLES1_LIBRARIES) message(FATAL_ERROR "Run-time loading of GLES1 is not supported (DEQP_GLES1_LIBRARIES is not set)") endif () -if (DEQP_SUPPORT_GLES2 AND NOT DEFINED DEQP_GLES2_LIBRARIES) - add_definitions(-DDEQP_GLES2_RUNTIME_LOAD=1) -endif () - -if (DEQP_SUPPORT_GLES3 AND NOT DEFINED DEQP_GLES3_LIBRARIES) - add_definitions(-DDEQP_GLES3_RUNTIME_LOAD=1) -endif () - if (DEQP_SUPPORT_VG AND NOT DEFINED DEQP_VG_LIBRARIES) message(FATAL_ERROR "Run-time loading of VG is not supported (DEQP_VG_LIBRARIES is not set)") endif () -if (DEQP_SUPPORT_EGL AND NOT DEFINED DEQP_EGL_LIBRARIES) - add_definitions(-DDEQP_EGL_RUNTIME_LOAD=1) -endif () - -# OpenGL is always loaded on run-time -if (DEQP_SUPPORT_OPENGL) - add_definitions(-DDEQP_OPENGL_RUNTIME_LOAD=1) -endif () - if (DE_COMPILER_IS_MSC) # Don't nag about std::copy for example set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_SCL_SECURE_NO_WARNINGS") diff --git a/framework/egl/egluStaticESLibrary.cpp b/framework/egl/egluStaticESLibrary.cpp index ece205b..7f25074 100644 --- a/framework/egl/egluStaticESLibrary.cpp +++ b/framework/egl/egluStaticESLibrary.cpp @@ -28,14 +28,14 @@ #define STATIC_LIB_ES20 1 #define STATIC_LIB_ES30 2 -#if defined(DEQP_SUPPORT_GLES3) && !defined(DEQP_GLES3_RUNTIME_LOAD) +#if !defined(DEQP_GLES3_RUNTIME_LOAD) # if (DE_OS == DE_OS_IOS) # include # else # include # endif # define STATIC_LIB STATIC_LIB_ES30 -#elif defined(DEQP_SUPPORT_GLES2) && !defined(DEQP_GLES2_RUNTIME_LOAD) +#elif !defined(DEQP_GLES2_RUNTIME_LOAD) # if (DE_OS == DE_OS_IOS) # include # else diff --git a/framework/egl/wrapper/eglwLibrary.cpp b/framework/egl/wrapper/eglwLibrary.cpp index fba4402..4a5f4e6 100644 --- a/framework/egl/wrapper/eglwLibrary.cpp +++ b/framework/egl/wrapper/eglwLibrary.cpp @@ -25,7 +25,7 @@ #include "tcuFunctionLibrary.hpp" #include "deDynamicLibrary.hpp" -#if defined(DEQP_SUPPORT_EGL) && !defined(DEQP_EGL_RUNTIME_LOAD) +#if !defined(DEQP_EGL_RUNTIME_LOAD) # include #endif @@ -47,7 +47,7 @@ namespace tcu::FunctionLibrary* createStaticLibrary (void) { -#if defined(DEQP_SUPPORT_EGL) && !defined(DEQP_EGL_RUNTIME_LOAD) +#if !defined(DEQP_EGL_RUNTIME_LOAD) static tcu::StaticFunctionLibrary::Entry s_staticEntries[] = { # if defined(EGL_VERSION_1_5) diff --git a/framework/opengl/simplereference/CMakeLists.txt b/framework/opengl/simplereference/CMakeLists.txt index 0eb2ded..b1952f0 100644 --- a/framework/opengl/simplereference/CMakeLists.txt +++ b/framework/opengl/simplereference/CMakeLists.txt @@ -13,15 +13,9 @@ set(SGLR_SRCS sglrReferenceUtils.hpp sglrShaderProgram.cpp sglrShaderProgram.hpp + sglrGLContext.cpp + sglrGLContext.hpp ) -if (DEQP_SUPPORT_GLES2 OR DEQP_SUPPORT_GLES3 OR DEQP_SUPPORT_OPENGL) - set(SGLR_SRCS - ${SGLR_SRCS} - sglrGLContext.cpp - sglrGLContext.hpp - ) -endif () - add_library(glutil-sglr STATIC ${SGLR_SRCS}) target_link_libraries(glutil-sglr glutil tcutil referencerenderer ${DEQP_GLES2_LIBRARIES}) diff --git a/framework/opengl/wrapper/glwInitES20Direct.cpp b/framework/opengl/wrapper/glwInitES20Direct.cpp index 9041bb5..3415a3c 100644 --- a/framework/opengl/wrapper/glwInitES20Direct.cpp +++ b/framework/opengl/wrapper/glwInitES20Direct.cpp @@ -25,7 +25,7 @@ #include -#if defined(DEQP_SUPPORT_GLES2) && !defined(DEQP_GLES2_RUNTIME_LOAD) +#if !defined(DEQP_GLES2_RUNTIME_LOAD) # if (DE_OS == DE_OS_IOS) # include # else @@ -38,7 +38,7 @@ namespace glw void initES20Direct (Functions* gl) { -#if defined(DEQP_SUPPORT_GLES2) && !defined(DEQP_GLES2_RUNTIME_LOAD) +#if !defined(DEQP_GLES2_RUNTIME_LOAD) # include "glwInitES20Direct.inl" #else DE_UNREF(gl); diff --git a/framework/opengl/wrapper/glwInitES30Direct.cpp b/framework/opengl/wrapper/glwInitES30Direct.cpp index 48e9186..48e6fbb 100644 --- a/framework/opengl/wrapper/glwInitES30Direct.cpp +++ b/framework/opengl/wrapper/glwInitES30Direct.cpp @@ -25,7 +25,7 @@ #include -#if defined(DEQP_SUPPORT_GLES3) && !defined(DEQP_GLES3_RUNTIME_LOAD) +#if !defined(DEQP_GLES3_RUNTIME_LOAD) # if (DE_OS == DE_OS_IOS) # include # else @@ -38,7 +38,7 @@ namespace glw void initES30Direct (Functions* gl) { -#if defined(DEQP_SUPPORT_GLES3) && !defined(DEQP_GLES3_RUNTIME_LOAD) +#if !defined(DEQP_GLES3_RUNTIME_LOAD) # include "glwInitES30Direct.inl" #else DE_UNREF(gl); diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt index 4ca2079..b868ac0 100644 --- a/framework/platform/CMakeLists.txt +++ b/framework/platform/CMakeLists.txt @@ -20,9 +20,16 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) ) elseif ((DE_OS_IS_UNIX OR DE_OS_IS_OSX) AND DEQP_USE_X11) + message(STATUS "DEQP_SUPPORT_GLX = ${DEQP_SUPPORT_GLX}") + if (DEQP_SUPPORT_GLX) + add_definitions(-DDEQP_SUPPORT_GLX=1) + endif () + set(TCUTIL_PLATFORM_SRCS X11/tcuX11.cpp X11/tcuX11.hpp + X11/tcuX11EglPlatform.hpp + X11/tcuX11EglPlatform.cpp X11/tcuX11Platform.hpp X11/tcuX11Platform.cpp X11/tcuX11VulkanPlatform.hpp @@ -35,13 +42,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) X11/tcuX11Xcb.cpp ) endif() - if (DEQP_SUPPORT_EGL) - set(TCUTIL_PLATFORM_SRCS - ${TCUTIL_PLATFORM_SRCS} - X11/tcuX11EglPlatform.hpp - X11/tcuX11EglPlatform.cpp - ) - endif() if (DEQP_SUPPORT_GLX) set(TCUTIL_PLATFORM_SRCS ${TCUTIL_PLATFORM_SRCS} @@ -49,9 +49,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) X11/tcuX11GlxPlatform.cpp ) endif() - if (NOT (DEQP_SUPPORT_EGL OR DEQP_SUPPORT_GLX)) - message(FATAL_ERROR "At least one of EGL and GLX must be enabled for X11") - endif () elseif (DE_OS_IS_ANDROID) set(TCUTIL_PLATFORM_SRCS android/tcuAndroidExecService.cpp diff --git a/framework/platform/X11/tcuX11Platform.cpp b/framework/platform/X11/tcuX11Platform.cpp index 115dc2f..830a463 100644 --- a/framework/platform/X11/tcuX11Platform.cpp +++ b/framework/platform/X11/tcuX11Platform.cpp @@ -31,12 +31,11 @@ #include "tcuFunctionLibrary.hpp" #include "deMemory.h" #include "tcuX11VulkanPlatform.hpp" +#include "tcuX11EglPlatform.hpp" + #if defined (DEQP_SUPPORT_GLX) # include "tcuX11GlxPlatform.hpp" #endif -#if defined (DEQP_SUPPORT_EGL) -# include "tcuX11EglPlatform.hpp" -#endif #include @@ -62,36 +61,27 @@ class X11Platform : public tcu::Platform public: X11Platform (void); bool processEvents (void) { return !m_eventState.getQuitFlag(); } - const glu::Platform& getGLPlatform (void) const { return m_glPlatform; } - -#if defined (DEQP_SUPPORT_EGL) - const eglu::Platform& getEGLPlatform (void) const { return m_eglPlatform; } -#endif // DEQP_SUPPORT_EGL const vk::Platform& getVulkanPlatform (void) const { return m_vkPlatform; } + const eglu::Platform& getEGLPlatform (void) const { return m_eglPlatform; } + const glu::Platform& getGLPlatform (void) const { return m_glPlatform; } private: EventState m_eventState; x11::VulkanPlatform m_vkPlatform; -#if defined (DEQP_SUPPORT_EGL) x11::egl::Platform m_eglPlatform; -#endif // DEQP_SPPORT_EGL X11GLPlatform m_glPlatform; }; - X11Platform::X11Platform (void) : m_vkPlatform (m_eventState) -#if defined (DEQP_SUPPORT_EGL) , m_eglPlatform (m_eventState) -#endif // DEQP_SUPPORT_EGL { #if defined (DEQP_SUPPORT_GLX) m_glPlatform.registerFactory(glx::createContextFactory(m_eventState)); #endif // DEQP_SUPPORT_GLX -#if defined (DEQP_SUPPORT_EGL) + m_glPlatform.registerFactory(m_eglPlatform.createContextFactory()); -#endif // DEQP_SUPPORT_EGL } } // x11 diff --git a/modules/egl/CMakeLists.txt b/modules/egl/CMakeLists.txt index 52e9fd9..a191391 100644 --- a/modules/egl/CMakeLists.txt +++ b/modules/egl/CMakeLists.txt @@ -103,6 +103,8 @@ set(DEQP_EGL_LIBS tcutil eglutil referencerenderer + glutil + glutil-sglr ${DEQP_EGL_LIBRARIES} ) @@ -112,10 +114,6 @@ if (DE_OS_IS_ANDROID) set(DEQP_EGL_LIBS ${DEQP_EGL_LIBS} tcutil-platform) endif () -if (DEQP_SUPPORT_GLES2) - set(DEQP_EGL_LIBS ${DEQP_EGL_LIBS} glutil glutil-sglr ${DEQP_GLES2_LIBRARIES}) -endif () - if (DEQP_SUPPORT_GLES1) set(DEQP_EGL_LIBS ${DEQP_EGL_LIBS} ${DEQP_GLES1_LIBRARIES}) endif () diff --git a/scripts/cppcheck.py b/scripts/cppcheck.py index 8fd5b48..73e01a6 100644 --- a/scripts/cppcheck.py +++ b/scripts/cppcheck.py @@ -116,10 +116,6 @@ ARGS = [ "-DDE_PTR_SIZE=4", "-DAB_COMPILER=1", "-DAB_OS=1", - "-DDEQP_SUPPORT_GLES2=1", - "-DDEQP_SUPPORT_GLES3=1", - "-DDEQP_SUPPORT_OPENCL=1", - "-DDEQP_SUPPORT_OPENGL=1", "-DDEQP_TARGET_NAME=\"Cppcheck\"", "-D_XOPEN_SOURCE=600", "--suppress=arrayIndexOutOfBounds:deqp/framework/common/tcuVector.hpp", diff --git a/targets/android/android.cmake b/targets/android/android.cmake index 9c51c2e..82eacaf 100644 --- a/targets/android/android.cmake +++ b/targets/android/android.cmake @@ -22,23 +22,18 @@ message("*** Using Android") set(DEQP_TARGET_NAME "Android") set(DEQP_SUPPORT_GLES1 ON) -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_EGL ON) - -# GLESv2 lib -find_library(GLES2_LIBRARY GLESv2 PATHS /usr/lib) -set(DEQP_GLES2_LIBRARIES ${GLES2_LIBRARY}) # GLESv1 lib find_library(GLES1_LIBRARY GLESv1_CM PATHS /usr/lib) set(DEQP_GLES1_LIBRARIES ${GLES1_LIBRARY}) +# GLESv2 lib +find_library(GLES2_LIBRARY GLESv2 PATHS /usr/lib) +set(DEQP_GLES2_LIBRARIES ${GLES2_LIBRARY}) + # EGL lib -if (DEQP_SUPPORT_EGL) - find_library(EGL_LIBRARY EGL PATHS /usr/lib) - set(DEQP_EGL_LIBRARIES ${EGL_LIBRARY}) -endif () +find_library(EGL_LIBRARY EGL PATHS /usr/lib) +set(DEQP_EGL_LIBRARIES ${EGL_LIBRARY}) # Platform libs find_library(LOG_LIBRARY NAMES log PATHS /usr/lib) diff --git a/targets/default/default.cmake b/targets/default/default.cmake index 11bd4b2..d4c95bc 100644 --- a/targets/default/default.cmake +++ b/targets/default/default.cmake @@ -23,12 +23,6 @@ message("*** Default target") set(DEQP_TARGET_NAME "Default") -# OpenGL (ES) & EGL tests do not require any libraries or headers -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_OPENGL ON) -set(DEQP_SUPPORT_EGL ON) - # For static linking find_library(GLES2_LIBRARY NAMES libGLESv2 GLESv2) find_library(EGL_LIBRARY NAMES libEGL EGL) diff --git a/targets/ios/ios.cmake b/targets/ios/ios.cmake index 34ad7f7..3f58d67 100644 --- a/targets/ios/ios.cmake +++ b/targets/ios/ios.cmake @@ -20,9 +20,6 @@ # iOS Target set(DEQP_TARGET_NAME "iOS") -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_EGL OFF) # Libraries find_library(GLES2_LIBRARY NAMES OpenGLES PATHS /System/Library/Frameworks) diff --git a/targets/null/null.cmake b/targets/null/null.cmake index fa47ace..933a30b 100644 --- a/targets/null/null.cmake +++ b/targets/null/null.cmake @@ -20,11 +20,7 @@ message("*** Using null context target") -set(DEQP_TARGET_NAME "Null") -set(DEQP_SUPPORT_EGL ON) -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_OPENGL ON) +set(DEQP_TARGET_NAME "Null") set(TCUTIL_PLATFORM_SRCS null/tcuNullPlatform.cpp diff --git a/targets/osx/osx.cmake b/targets/osx/osx.cmake index 2390f40..c82b14c 100644 --- a/targets/osx/osx.cmake +++ b/targets/osx/osx.cmake @@ -22,8 +22,6 @@ set(DEQP_TARGET_NAME "OS X") -set(DEQP_SUPPORT_OPENGL ON) - find_package(OpenGL REQUIRED) set(DEQP_PLATFORM_LIBRARIES ${OPENGL_LIBRARIES}) include_directories(${OPENGL_INCLUDE_DIRS}) diff --git a/targets/raspi/raspi.cmake b/targets/raspi/raspi.cmake index 76742d8..a5166e6 100644 --- a/targets/raspi/raspi.cmake +++ b/targets/raspi/raspi.cmake @@ -21,9 +21,7 @@ # Raspberry Pi target message("*** Using Raspberry Pi") set(DEQP_TARGET_NAME "Raspberry Pi") -set(DEQP_SUPPORT_GLES2 ON) set(DEQP_SUPPORT_VG ON) -set(DEQP_SUPPORT_EGL ON) find_path(SYSTEM_INCLUDE bcm_host.h PATHS /usr/include /opt/vc/include) include_directories( diff --git a/targets/wayland/wayland.cmake b/targets/wayland/wayland.cmake index fae8158..4d1ca3d 100644 --- a/targets/wayland/wayland.cmake +++ b/targets/wayland/wayland.cmake @@ -19,11 +19,7 @@ #------------------------------------------------------------------------- message("*** Using Wayland target") -set(DEQP_TARGET_NAME "WAYLAND") -set(DEQP_RUNTIME_LINK ON) -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_EGL ON) +set(DEQP_TARGET_NAME "Wayland") # Use Wayland target set(DEQP_USE_WAYLAND ON) diff --git a/targets/win32_wgl/win32_wgl.cmake b/targets/win32_wgl/win32_wgl.cmake index 13fd960..d20d7f2 100644 --- a/targets/win32_wgl/win32_wgl.cmake +++ b/targets/win32_wgl/win32_wgl.cmake @@ -19,8 +19,4 @@ #------------------------------------------------------------------------- message("*** Using WGL") -set(DEQP_TARGET_NAME "WGL") -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_OPENGL ON) -set(DEQP_SUPPORT_EGL ON) +set(DEQP_TARGET_NAME "WGL") diff --git a/targets/x11_egl/x11_egl.cmake b/targets/x11_egl/x11_egl.cmake index aeddf6c..8e8155b 100644 --- a/targets/x11_egl/x11_egl.cmake +++ b/targets/x11_egl/x11_egl.cmake @@ -20,11 +20,6 @@ message("*** Using X11 EGL target") set(DEQP_TARGET_NAME "X11 EGL") -set(DEQP_RUNTIME_LINK ON) -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_OPENGL ON) -set(DEQP_SUPPORT_EGL ON) set(DEQP_SUPPORT_GLX OFF) # Use X11 target diff --git a/targets/x11_egl_glx/x11_egl_glx.cmake b/targets/x11_egl_glx/x11_egl_glx.cmake index 6290e68..15d642b 100644 --- a/targets/x11_egl_glx/x11_egl_glx.cmake +++ b/targets/x11_egl_glx/x11_egl_glx.cmake @@ -20,10 +20,6 @@ message("*** Using X11 EGL/GLX target") set(DEQP_TARGET_NAME "X11 EGL/GLX") -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_OPENGL ON) -set(DEQP_SUPPORT_EGL ON) set(DEQP_SUPPORT_GLX ON) # Use X11 target diff --git a/targets/x11_glx/x11_glx.cmake b/targets/x11_glx/x11_glx.cmake index af2480f..ebbf09c 100644 --- a/targets/x11_glx/x11_glx.cmake +++ b/targets/x11_glx/x11_glx.cmake @@ -20,10 +20,6 @@ message("*** Using X11 GLX target") set(DEQP_TARGET_NAME "X11 GLX") -set(DEQP_SUPPORT_GLES2 ON) -set(DEQP_SUPPORT_GLES3 ON) -set(DEQP_SUPPORT_OPENGL ON) -set(DEQP_SUPPORT_EGL OFF) set(DEQP_SUPPORT_GLX ON) # Use X11 target -- 2.7.4