diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-07-06 10:17:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 11:48:16 +0100 |
| commit | eac70f467f54ab26adbfef96173cbcfe717bc3f6 (patch) | |
| tree | d5c5740307f28120c47f5825ce7e0c22fe5fb4a0 | |
| parent | 8a9df8d60168a648bccf44101ca9a4c4512daadb (diff) | |
| download | qtwebengine-chromium-eac70f467f54ab26adbfef96173cbcfe717bc3f6.tar.gz | |
Fix WGL after reinstating it
Later changes need corresponding updates from WGL backend.
Change-Id: I0e740acd372b4cd21745041ff7b2caa2a1fd620c
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/ui/gl/gl_bindings_autogen_wgl.cc | 3 | ||||
| -rw-r--r-- | chromium/ui/gl/gl_surface_wgl.cc | 9 | ||||
| -rw-r--r-- | chromium/ui/gl/gl_surface_wgl.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chromium/ui/gl/gl_bindings_autogen_wgl.cc b/chromium/ui/gl/gl_bindings_autogen_wgl.cc index 6ad1ac08104..7e80dfe3fe5 100644 --- a/chromium/ui/gl/gl_bindings_autogen_wgl.cc +++ b/chromium/ui/gl/gl_bindings_autogen_wgl.cc @@ -66,8 +66,7 @@ void DriverWGL::InitializeStaticBindings() { void DriverWGL::InitializeExtensionBindings() { std::string platform_extensions(GetPlatformExtensions()); - gfx::ExtensionSet extensions(gfx::MakeExtensionSet(platform_extensions)); - ALLOW_UNUSED_LOCAL(extensions); + [[maybe_unused]] gfx::ExtensionSet extensions(gfx::MakeExtensionSet(platform_extensions)); ext.b_WGL_ARB_create_context = gfx::HasExtension(extensions, "WGL_ARB_create_context"); diff --git a/chromium/ui/gl/gl_surface_wgl.cc b/chromium/ui/gl/gl_surface_wgl.cc index e496c308d46..26e7c341551 100644 --- a/chromium/ui/gl/gl_surface_wgl.cc +++ b/chromium/ui/gl/gl_surface_wgl.cc @@ -57,7 +57,7 @@ LRESULT CALLBACK IntermediateWindowProc(HWND window, } } -class DisplayWGL { +class DisplayWGL : public GLDisplay { public: DisplayWGL() : module_handle_(0), @@ -156,6 +156,7 @@ class DisplayWGL { ATOM window_class() const { return window_class_; } HDC device_context() const { return device_context_; } int pixel_format() const { return pixel_format_; } + void* GetDisplay() override { return device_context(); } private: HINSTANCE module_handle_; @@ -164,7 +165,7 @@ class DisplayWGL { HDC device_context_; int pixel_format_; }; -DisplayWGL* g_wgl_display; +DisplayWGL* g_wgl_display = NULL; } // namespace // static @@ -176,8 +177,8 @@ GLSurfaceWGL::GLSurfaceWGL() { GLSurfaceWGL::~GLSurfaceWGL() { } -void* GLSurfaceWGL::GetDisplay() { - return GetDisplayDC(); +GLDisplay* GLSurfaceWGL::GetGLDisplay() { + return g_wgl_display; } // static diff --git a/chromium/ui/gl/gl_surface_wgl.h b/chromium/ui/gl/gl_surface_wgl.h index c7928384fe8..755ab3bb6dc 100644 --- a/chromium/ui/gl/gl_surface_wgl.h +++ b/chromium/ui/gl/gl_surface_wgl.h @@ -17,7 +17,7 @@ class GL_EXPORT GLSurfaceWGL : public GLSurface { GLSurfaceWGL(); // Implement GLSurface. - void* GetDisplay() override; + GLDisplay* GetGLDisplay() override; static bool InitializeOneOff(); static bool InitializeExtensionSettingsOneOff(); |