lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-27 12:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make EGL support independent of GLES support

Browse Source 
EGL (>= 1.4) supports desktop GL, in addition to GLES. This commit makes
EGL support independently configurable at build time, to allow GL to use
it even if GLES is not needed or available.
This commit is contained in:
Alexandros Frantzis
2019-10-10 14:48:16 +03:00
committed by Baldur Karlsson
parent 8259348707
commit 616a355a63
3 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+17 -1
View File
@@ -159,6 +159,7 @@ project(RenderDoc CXX C)
option(ENABLE_GL "Enable GL driver" ON)
option(ENABLE_GLES "Enable GL ES driver" ON)
option(ENABLE_EGL "Enable EGL" ON)
option(ENABLE_VULKAN "Enable Vulkan driver" ON)
option(ENABLE_RENDERDOCCMD "Enable renderdoccmd" ON)
option(ENABLE_QRENDERDOC "Enable qrenderdoc" ON)
@@ -227,6 +228,7 @@ endif()
if(APPLE)
message(STATUS "Disabling GLES driver on apple")
set(ENABLE_GLES OFF CACHE BOOL "" FORCE)
set(ENABLE_EGL OFF CACHE BOOL "" FORCE)
endif()
if(ANDROID)
@@ -235,6 +237,7 @@ if(ANDROID)
endif()
set(ENABLE_GL OFF CACHE BOOL "" FORCE)
set(ENABLE_GLES ON CACHE BOOL "" FORCE)
set(ENABLE_EGL ON CACHE BOOL "" FORCE)
# Android doesn't support the Qt UI for obvious reasons
message(STATUS "Disabling qrenderdoc for android build")
@@ -252,6 +255,7 @@ if(ENABLE_GGP)
message(STATUS "Disabling GL, GLES driver on ggp")
set(ENABLE_GL OFF CACHE BOOL "" FORCE)
set(ENABLE_GLES OFF CACHE BOOL "" FORCE)
set(ENABLE_EGL OFF CACHE BOOL "" FORCE)
# GGP doesn't support the Qt UI
message(STATUS "Disabling qrenderdoc for ggp build")
@@ -261,6 +265,10 @@ if(ENABLE_GGP)
set(ENABLE_PYRENDERDOC OFF CACHE BOOL "" FORCE)
endif()
if(ENABLE_GLES AND NOT ENABLE_EGL)
message(FATAL_ERROR "EGL is required for GLES")
endif()
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
@@ -272,6 +280,10 @@ if(ENABLE_GLES)
add_definitions(-DRENDERDOC_SUPPORT_GLES)
endif()
if(ENABLE_EGL)
add_definitions(-DRENDERDOC_SUPPORT_EGL)
endif()
if(ENABLE_VULKAN)
add_definitions(-DRENDERDOC_SUPPORT_VULKAN)
endif()
@@ -378,7 +390,11 @@ install (FILES LICENSE.md DESTINATION share/doc/renderdoc)
message(STATUS "Enabled APIs:")
if(ENABLE_GL)
message(STATUS " - OpenGL")
if(ENABLE_EGL)
message(STATUS " - OpenGL (with additional EGL support)")
else()
message(STATUS " - OpenGL")
endif()
endif()
if(ENABLE_GLES)
renderdoc/driver/gl/CMakeLists.txt
+4 -1
View File
@@ -67,11 +67,14 @@ else()
glx_fake_vk_hooks.cpp)
endif()
if(ENABLE_GLES)
list(APPEND sources
official/glesext.h)
endif()
if(ENABLE_EGL)
list(APPEND sources
official/egl.h
official/eglext.h
official/eglplatform.h
official/glesext.h
egl_dispatch_table.h
egl_platform.cpp
egl_hooks.cpp)
renderdoc/driver/gl/gl_common.h
+13 -17
View File
@@ -48,6 +48,7 @@ DECLARE_REFLECTION_ENUM(RDCGLenum);
// appropriate libEGL.dll into plugins/gles/ in your RenderDoc folder.
#define RENDERDOC_SUPPORT_GL
#define RENDERDOC_SUPPORT_GLES
#define RENDERDOC_SUPPORT_EGL
#else
@@ -126,7 +127,7 @@ struct GLWindowingData
#endif
#if defined(RENDERDOC_SUPPORT_GLES)
#if defined(RENDERDOC_SUPPORT_EGL)
// force include the elgplatform.h, as we want to use
// our own because the system one could be a bit older and
@@ -144,7 +145,7 @@ struct GLWindowingData
dpy = NULL;
ctx = NULL;
wnd = (GLWindowPtr)NULL;
egl_wnd = (GLESWindowPtr)NULL;
egl_wnd = (EGLSurface)NULL;
cfg = NULL;
}
@@ -160,35 +161,30 @@ struct GLWindowingData
typedef void *GLConfigPtr;
#endif
#if defined(RENDERDOC_SUPPORT_GLES)
typedef EGLDisplay GLESDisplayPtr;
typedef EGLContext GLESContextPtr;
typedef EGLSurface GLESWindowPtr;
typedef EGLConfig GLESConfigPtr;
#else
typedef void *GLESDisplayPtr;
typedef void *GLESContextPtr;
typedef void *GLESWindowPtr;
typedef void *GLESConfigPtr;
#if !defined(RENDERDOC_SUPPORT_EGL)
typedef void *EGLDisplay;
typedef void *EGLContext;
typedef void *EGLSurface;
typedef void *EGLConfig;
#endif
union
{
GLDisplayPtr dpy;
GLESDisplayPtr egl_dpy;
EGLDisplay egl_dpy;
};
union
{
GLContextPtr ctx;
GLESContextPtr egl_ctx;
EGLContext egl_ctx;
};
union
{
GLConfigPtr cfg;
GLESConfigPtr egl_cfg;
EGLConfig egl_cfg;
};
GLWindowPtr wnd;
GLESWindowPtr egl_wnd;
EGLSurface egl_wnd;
};
#elif ENABLED(RDOC_APPLE)
@@ -331,7 +327,7 @@ GLPlatform &GetGLPlatform();
#endif
#if defined(RENDERDOC_SUPPORT_GLES)
#if defined(RENDERDOC_SUPPORT_EGL)
// using EGL. Different name since it both platform GL and EGL libraries can be available at once
GLPlatform &GetEGLPlatform();