diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-10-31 13:20:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-12-09 19:53:11 +0100 |
| commit | 55ed2da25e0cfe904e016421eadcbb7ab50669df (patch) | |
| tree | 84e8af4b94ea565427696a392331c1475e00ec9c /src/core/ozone/gl_surface_qt.cpp | |
| parent | 7cc542c24464756cfe1fad9019e788080f2a6528 (diff) | |
Chromium 118 adaptations
Change-Id: I8eea99a472cc597ff9864b570c90b28b79b3751e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/ozone/gl_surface_qt.cpp')
| -rw-r--r-- | src/core/ozone/gl_surface_qt.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/ozone/gl_surface_qt.cpp b/src/core/ozone/gl_surface_qt.cpp index 67d534f95..0cbe75cbd 100644 --- a/src/core/ozone/gl_surface_qt.cpp +++ b/src/core/ozone/gl_surface_qt.cpp @@ -20,6 +20,7 @@ #include "gpu/ipc/service/image_transport_surface.h" #include "ui/gl/init/gl_display_initializer.h" #include "ui/gl/direct_composition_support.h" +#include "ui/gl/gl_angle_util_win.h" #include "ui/gl/gl_display.h" #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_surface_egl.h" @@ -106,7 +107,8 @@ gl::GLDisplay *InitializeGLOneOffPlatform(gl::GpuPreference gpu_preference) LOG(ERROR) << "GLDisplayEGL::Initialize failed."; return nullptr; } - InitializeDirectComposition(display); + if (auto d3d11_device = QueryD3D11DeviceObjectFromANGLE()) + InitializeDirectComposition(std::move(d3d11_device)); break; case kGLImplementationMockGL: case kGLImplementationStubGL: |