diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-21 10:40:11 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-21 13:05:58 +0000 |
| commit | c5bcd124fecaad2b7f50c59bd3790fcc4af38a20 (patch) | |
| tree | 8b5f98d6e50be1a07db8f302aecd843ddf3af7b5 /src/core | |
| parent | e85835c5a824c1979ace67aa3940c0fbdca40fd6 (diff) | |
Fix build with only OpenGL/ES2
Define the needed extension when not available at compile time,
move the define after usage was changed in commit 24e878d35.
Change-Id: I6ce3c87832b91fb2ac5edf5c4c47bb8e8f935b0a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/compositor/compositor_resource_fence.cpp | 4 | ||||
| -rw-r--r-- | src/core/compositor/delegated_frame_node.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/compositor/compositor_resource_fence.cpp b/src/core/compositor/compositor_resource_fence.cpp index b3f868d43..4efed00d3 100644 --- a/src/core/compositor/compositor_resource_fence.cpp +++ b/src/core/compositor/compositor_resource_fence.cpp @@ -43,6 +43,10 @@ #include <QtGui/qopenglcontext.h> +#ifndef GL_TIMEOUT_IGNORED +#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull +#endif + namespace QtWebEngineCore { void CompositorResourceFence::wait() diff --git a/src/core/compositor/delegated_frame_node.cpp b/src/core/compositor/delegated_frame_node.cpp index e91a8728f..571d02773 100644 --- a/src/core/compositor/delegated_frame_node.cpp +++ b/src/core/compositor/delegated_frame_node.cpp @@ -84,10 +84,6 @@ #include <EGL/eglext.h> #endif -#ifndef GL_TIMEOUT_IGNORED -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull -#endif - #ifndef GL_TEXTURE_RECTANGLE #define GL_TEXTURE_RECTANGLE 0x84F5 #endif |