<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[265366] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/265366">265366</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2020-08-07 02:28:55 -0700 (Fri, 07 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Pocket City game play area is blank (WebGL is broken in Catalyst)
https://bugs.webkit.org/show_bug.cgi?id=215251

Reviewed by Tim Horton.

Our configuration for WebGL under Catalyst was incorrect. Since
it uses "desktop" OpenGL, it had to use the normal macOS setup
(enabling texture rectangle extension, and the correct target).

* platform/graphics/GraphicsContextGL.h: Add PLATFORM(MACCATALYST).
* platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm: Ditto.
(WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextGLh">trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaGraphicsContextGLOpenGLCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (265365 => 265366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-08-07 08:32:41 UTC (rev 265365)
+++ trunk/Source/WebCore/ChangeLog      2020-08-07 09:28:55 UTC (rev 265366)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2020-08-07  Dean Jackson  <dino@apple.com>
+
+        Pocket City game play area is blank (WebGL is broken in Catalyst)
+        https://bugs.webkit.org/show_bug.cgi?id=215251
+
+        Reviewed by Tim Horton.
+
+        Our configuration for WebGL under Catalyst was incorrect. Since
+        it uses "desktop" OpenGL, it had to use the normal macOS setup
+        (enabling texture rectangle extension, and the correct target).
+
+        * platform/graphics/GraphicsContextGL.h: Add PLATFORM(MACCATALYST).
+        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm: Ditto.
+        (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+
</ins><span class="cx"> 2020-08-07  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Fix warnings related to unsigned >=0 ASSERTs
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextGLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h (265365 => 265366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h       2020-08-07 08:32:41 UTC (rev 265365)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h  2020-08-07 09:28:55 UTC (rev 265366)
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx">         // These constants are redefined here from ANGLE's OpenGL ES headers to
</span><span class="cx">         // provide a single place where multiple portions of platform code can
</span><span class="cx">         // reference them.
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
</ins><span class="cx">         IOSurfaceTextureTarget = TEXTURE_RECTANGLE_ARB, // also GL_TEXTURE_RECTANGLE_ANGLE
</span><span class="cx">         IOSurfaceTextureTargetQuery = TEXTURE_BINDING_RECTANGLE_ARB,
</span><span class="cx">         EGLIOSurfaceTextureTarget = 0x345B, // EGL_TEXTURE_RECTANGLE_ANGLE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaGraphicsContextGLOpenGLCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (265365 => 265366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm     2020-08-07 08:32:41 UTC (rev 265365)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm        2020-08-07 09:28:55 UTC (rev 265366)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx">     if (m_isForWebGL2)
</span><span class="cx">         gl::Enable(GraphicsContextGL::PRIMITIVE_RESTART_FIXED_INDEX);
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
</ins><span class="cx">     ExtensionsGL& extensions = getExtensions();
</span><span class="cx"> 
</span><span class="cx">     static constexpr const char* requiredExtensions[] = {
</span><span class="lines">@@ -401,6 +401,7 @@
</span><span class="cx">         extensions.ensureEnabled(requiredExtensions[i]);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     EGLDeviceEXT device = nullptr;
</span><span class="cx">     EGL_QueryDisplayAttribEXT(m_displayObj, EGL_DEVICE_EXT, reinterpret_cast<EGLAttrib*>(&device));
</span><span class="cx">     CGLContextObj cglContext = nullptr;
</span><span class="lines">@@ -411,6 +412,10 @@
</span><span class="cx">     setGPUByRegistryID(cglContext, pixelFormat, gpuID);
</span><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(hostWindow);
</span><ins>+#endif
+
+#else
+    UNUSED_PARAM(hostWindow);
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx"> 
</span><span class="cx"> #endif // #elif USE(ANGLE)
</span></span></pre>
</div>
</div>

</body>
</html>