Title: [253632] trunk
Revision
253632
Author
changs...@webkit.org
Date
2019-12-17 10:58:42 -0800 (Tue, 17 Dec 2019)

Log Message

[GTK] Suppress undefined USE_OPENGL warnings when USE_ANGLE_WEBGL and USE_OPENGL_ES are enabled.
https://bugs.webkit.org/show_bug.cgi?id=204634

Reviewed by Žan Doberšek.

When USE_ANGLE_WEBGL and USE_OPENGL_ES are enabled, many compiler warnings occur.
This is because USE_OPENGL is defined nowhere if they are enabled.
To fix this, USE_OPENGL is explicitly defined when USE_OPENGL_ES is enabled.

* Source/cmake/OptionsGTK.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (253631 => 253632)


--- trunk/ChangeLog	2019-12-17 18:31:30 UTC (rev 253631)
+++ trunk/ChangeLog	2019-12-17 18:58:42 UTC (rev 253632)
@@ -1,3 +1,16 @@
+2019-12-17  ChangSeok Oh  <changs...@webkit.org>
+
+        [GTK] Suppress undefined USE_OPENGL warnings when USE_ANGLE_WEBGL and USE_OPENGL_ES are enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=204634
+
+        Reviewed by Žan Doberšek.
+
+        When USE_ANGLE_WEBGL and USE_OPENGL_ES are enabled, many compiler warnings occur.
+        This is because USE_OPENGL is defined nowhere if they are enabled.
+        To fix this, USE_OPENGL is explicitly defined when USE_OPENGL_ES is enabled.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2019-12-16  Simon Fraser  <simon.fra...@apple.com>
 
         Let the DrawingArea decide whether scrolling is delegated

Modified: trunk/Source/cmake/OptionsGTK.cmake (253631 => 253632)


--- trunk/Source/cmake/OptionsGTK.cmake	2019-12-17 18:31:30 UTC (rev 253631)
+++ trunk/Source/cmake/OptionsGTK.cmake	2019-12-17 18:58:42 UTC (rev 253632)
@@ -279,6 +279,7 @@
     if (ENABLE_GLES2)
         find_package(OpenGLES2 REQUIRED)
         SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES TRUE)
+        SET_AND_EXPOSE_TO_BUILD(USE_OPENGL FALSE)
 
         if (NOT EGL_FOUND)
             message(FATAL_ERROR "EGL is needed for ENABLE_GLES2.")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to