Modified: branches/safari-613-branch/Source/WebKit/ChangeLog (291915 => 291916)
--- branches/safari-613-branch/Source/WebKit/ChangeLog 2022-03-26 01:51:08 UTC (rev 291915)
+++ branches/safari-613-branch/Source/WebKit/ChangeLog 2022-03-26 01:51:11 UTC (rev 291916)
@@ -1,5 +1,42 @@
2022-03-22 Alan Coon <[email protected]>
+ Cherry-pick r290367. rdar://problem/88567612
+
+ Fix GPUP WebGL generator script wrt uninitialised sized span
+ https://bugs.webkit.org/show_bug.cgi?id=235889
+
+ Patch by Kimmo Kinnunen <[email protected]> on 2022-02-23
+ Reviewed by Antti Koivisto.
+ Source/WebKit:
+
+ Regenerated.
+
+ * WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp:
+ (WebKit::RemoteGraphicsContextGLProxy::getShaderPrecisionFormat):
+
+ Tools:
+
+ Fix the generator. The r290328 only edited the generated files.
+ Add a other hunk missing from r290175.
+
+ * Scripts/generate-gpup-webgl:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290367 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-23 Kimmo Kinnunen <[email protected]>
+
+ Fix GPUP WebGL generator script wrt uninitialised sized span
+ https://bugs.webkit.org/show_bug.cgi?id=235889
+
+ Reviewed by Antti Koivisto.
+
+ Regenerated.
+
+ * WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp:
+ (WebKit::RemoteGraphicsContextGLProxy::getShaderPrecisionFormat):
+
+2022-03-22 Alan Coon <[email protected]>
+
Revert r289292. rdar://problem/90113314
2022-03-22 Alan Coon <[email protected]>
Modified: branches/safari-613-branch/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp (291915 => 291916)
--- branches/safari-613-branch/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp 2022-03-26 01:51:08 UTC (rev 291915)
+++ branches/safari-613-branch/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp 2022-03-26 01:51:11 UTC (rev 291916)
@@ -686,8 +686,8 @@
void RemoteGraphicsContextGLProxy::getShaderPrecisionFormat(GCGLenum shaderType, GCGLenum precisionType, GCGLSpan<GCGLint, 2> range, GCGLint* precision)
{
- constexpr std::array<int32_t, 2> emptyRangeReply { 0, 0 };
- IPC::ArrayReference<int32_t, 2> rangeReply { emptyRangeReply };
+ constexpr std::array<int32_t, 2> rangeReplyEmpty { };
+ IPC::ArrayReference<int32_t, 2> rangeReply { rangeReplyEmpty };
int32_t precisionReply = { };
if (!isContextLost()) {
auto sendResult = sendSync(Messages::RemoteGraphicsContextGL::GetShaderPrecisionFormat(shaderType, precisionType), Messages::RemoteGraphicsContextGL::GetShaderPrecisionFormat::Reply(rangeReply, precisionReply));
Modified: branches/safari-613-branch/Tools/ChangeLog (291915 => 291916)
--- branches/safari-613-branch/Tools/ChangeLog 2022-03-26 01:51:08 UTC (rev 291915)
+++ branches/safari-613-branch/Tools/ChangeLog 2022-03-26 01:51:11 UTC (rev 291916)
@@ -1,5 +1,41 @@
2022-03-22 Alan Coon <[email protected]>
+ Cherry-pick r290367. rdar://problem/88567612
+
+ Fix GPUP WebGL generator script wrt uninitialised sized span
+ https://bugs.webkit.org/show_bug.cgi?id=235889
+
+ Patch by Kimmo Kinnunen <[email protected]> on 2022-02-23
+ Reviewed by Antti Koivisto.
+ Source/WebKit:
+
+ Regenerated.
+
+ * WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp:
+ (WebKit::RemoteGraphicsContextGLProxy::getShaderPrecisionFormat):
+
+ Tools:
+
+ Fix the generator. The r290328 only edited the generated files.
+ Add a other hunk missing from r290175.
+
+ * Scripts/generate-gpup-webgl:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290367 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-23 Kimmo Kinnunen <[email protected]>
+
+ Fix GPUP WebGL generator script wrt uninitialised sized span
+ https://bugs.webkit.org/show_bug.cgi?id=235889
+
+ Reviewed by Antti Koivisto.
+ Fix the generator. The r290328 only edited the generated files.
+ Add a other hunk missing from r290175.
+
+ * Scripts/generate-gpup-webgl:
+
+2022-03-22 Alan Coon <[email protected]>
+
Revert r290708. rdar://problem/90113314
2022-03-23 Alan Coon <[email protected]>
Modified: branches/safari-613-branch/Tools/Scripts/generate-gpup-webgl (291915 => 291916)
--- branches/safari-613-branch/Tools/Scripts/generate-gpup-webgl 2022-03-26 01:51:08 UTC (rev 291915)
+++ branches/safari-613-branch/Tools/Scripts/generate-gpup-webgl 2022-03-26 01:51:11 UTC (rev 291916)
@@ -103,7 +103,9 @@
void GetError() -> (uint32_t returnValue) Synchronous
void PaintRenderingResultsToCanvas(WebCore::RenderingResourceIdentifier imageBuffer) -> () Synchronous
void PaintCompositedResultsToCanvas(WebCore::RenderingResourceIdentifier imageBuffer) -> () Synchronous
- void CopyTextureFromMedia(WebCore::MediaPlayerIdentifier identifier, uint32_t texture, uint32_t target, int32_t level, uint32_t internalFormat, uint32_t format, uint32_t type, bool premultiplyAlpha, bool flipY) -> (bool success) Synchronous
+#if ENABLE(VIDEO)
+ void CopyTextureFromVideoFrame(WebKit::RemoteVideoFrameReadReference videoFrame, uint32_t texture, uint32_t target, int32_t level, uint32_t internalFormat, uint32_t format, uint32_t type, bool premultiplyAlpha, bool flipY) -> (bool success) Synchronous
+#endif
void SimulateEventForTesting(WebCore::GraphicsContextGL::SimulatedEventForTesting event)
{}
}}
@@ -640,7 +642,13 @@
webkit_ipc_type = webkit_ipc_types[o.type]
assert(isinstance(webkit_ipc_type, cpp_type_container))
v = cpp_arg(webkit_ipc_type, o.name + "Reply")
- self.pre_call_stmts += [f"{str(v.type)} {str(v.name)};"]
+ if o.type.is_dynamic_span():
+ self.pre_call_stmts += [f"{str(v.type)} {str(v.name)};"]
+ else:
+ self.pre_call_stmts += [
+ f"constexpr std::array<{str(v.type.get_contained_type())}, {str(v.type.get_arity())}> {str(v.name)}Empty {{ }};",
+ f"{str(v.type)} {str(v.name)} {{ {str(v.name)}Empty }};"
+ ]
self.out_exprs += [cpp_expr(v.type, v.name)]
if o.type.is_dynamic_span():
self.in_exprs += [cpp_expr(get_cpp_type("size_t"), f"{o.name}.bufSize")]
