summaryrefslogtreecommitdiffstats
path: root/src/core/ozone
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-20 14:17:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-10 10:26:38 +0200
commit9cfde2edf4736ae9533e7e1fac495a23ad905419 (patch)
tree4eca639f54719a8824a527ee6a40fb13b462b110 /src/core/ozone
parent0a01998411de6a46af8d0b0ae13b8f401cd14a4b (diff)
Adaptations for Chromium 75
Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/ozone')
-rw-r--r--src/core/ozone/gl_ozone_glx_qt.cpp6
-rw-r--r--src/core/ozone/gl_ozone_glx_qt.h3
-rw-r--r--src/core/ozone/gl_surface_egl_qt.cpp5
3 files changed, 11 insertions, 3 deletions
diff --git a/src/core/ozone/gl_ozone_glx_qt.cpp b/src/core/ozone/gl_ozone_glx_qt.cpp
index e3a4f4708..f934a5c80 100644
--- a/src/core/ozone/gl_ozone_glx_qt.cpp
+++ b/src/core/ozone/gl_ozone_glx_qt.cpp
@@ -111,8 +111,10 @@ void GLOzoneGLXQt::ShutdownGL() {
}
bool GLOzoneGLXQt::GetGLWindowSystemBindingInfo(
- gl::GLWindowSystemBindingInfo* info) {
- return gl::GetGLWindowSystemBindingInfoGLX(info);
+ const gl::GLVersionInfo &gl_info,
+ gl::GLWindowSystemBindingInfo *info)
+{
+ return gl::GetGLWindowSystemBindingInfoGLX(gl_info, info);
}
scoped_refptr<gl::GLContext> GLOzoneGLXQt::CreateGLContext(
diff --git a/src/core/ozone/gl_ozone_glx_qt.h b/src/core/ozone/gl_ozone_glx_qt.h
index ffbd60454..1596ea12f 100644
--- a/src/core/ozone/gl_ozone_glx_qt.h
+++ b/src/core/ozone/gl_ozone_glx_qt.h
@@ -60,7 +60,8 @@ public:
void SetDisabledExtensionsPlatform(
const std::string& disabled_extensions) override;
bool GetGLWindowSystemBindingInfo(
- gl::GLWindowSystemBindingInfo* info) override;
+ const gl::GLVersionInfo &gl_info,
+ gl::GLWindowSystemBindingInfo *info) override;
scoped_refptr<gl::GLContext> CreateGLContext(
gl::GLShareGroup* share_group,
diff --git a/src/core/ozone/gl_surface_egl_qt.cpp b/src/core/ozone/gl_surface_egl_qt.cpp
index 33dd5745f..97c6cdee6 100644
--- a/src/core/ozone/gl_surface_egl_qt.cpp
+++ b/src/core/ozone/gl_surface_egl_qt.cpp
@@ -164,6 +164,11 @@ bool GLSurfaceEGL::IsCreateContextClientArraysSupported()
return false;
}
+bool GLSurfaceEGL::IsPixelFormatFloatSupported()
+{
+ return false;
+}
+
void GLSurfaceEGL::ShutdownOneOff()
{
}