Diff
Modified: trunk/Source/WebCore/ChangeLog (242163 => 242164)
--- trunk/Source/WebCore/ChangeLog 2019-02-27 22:59:13 UTC (rev 242163)
+++ trunk/Source/WebCore/ChangeLog 2019-02-27 23:09:19 UTC (rev 242164)
@@ -1,3 +1,17 @@
+2019-02-27 Justin Fan <justin_...@apple.com>
+ Fix build errors after Web GPU buffer updates changed some IDL fields from unsigned long to unsigned long long.
+
+ Unreviewed build fix.
+
+ * Modules/webgpu/WebGPUBuffer.cpp:
+ (WebCore::WebGPUBuffer::setSubData):
+ * Modules/webgpu/WebGPUBuffer.h:
+ * Modules/webgpu/WebGPUBufferBinding.h:
+ * Modules/webgpu/WebGPURenderPassEncoder.idl:
+ * platform/graphics/gpu/GPUBufferBinding.h:
+ * platform/graphics/gpu/GPUVertexAttributeDescriptor.h:
+ * platform/graphics/gpu/GPUVertexInputDescriptor.h:
+
2019-02-27 John Wilander <wilan...@apple.com>
Adopt WebCore::RegistrableDomain in WebCore::ResourceLoadStatistics and WebKit::NetworkProcessProxy
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.cpp (242163 => 242164)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.cpp 2019-02-27 22:59:13 UTC (rev 242163)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.cpp 2019-02-27 23:09:19 UTC (rev 242164)
@@ -42,7 +42,7 @@
{
}
-void WebGPUBuffer::setSubData(unsigned long offset, const JSC::ArrayBuffer& data)
+void WebGPUBuffer::setSubData(unsigned long long offset, const JSC::ArrayBuffer& data)
{
if (!m_buffer)
LOG(WebGPU, "GPUBuffer::setSubData(): Invalid operation!");
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.h (242163 => 242164)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.h 2019-02-27 22:59:13 UTC (rev 242163)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.h 2019-02-27 23:09:19 UTC (rev 242164)
@@ -47,7 +47,7 @@
RefPtr<GPUBuffer> buffer() const { return m_buffer; }
- void setSubData(unsigned long, const JSC::ArrayBuffer&);
+ void setSubData(unsigned long long, const JSC::ArrayBuffer&);
using BufferMappingPromise = DOMPromiseDeferred<IDLInterface<JSC::ArrayBuffer>>;
void mapReadAsync(BufferMappingPromise&&);
void mapWriteAsync(BufferMappingPromise&&);
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUBufferBinding.h (242163 => 242164)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUBufferBinding.h 2019-02-27 22:59:13 UTC (rev 242163)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUBufferBinding.h 2019-02-27 23:09:19 UTC (rev 242164)
@@ -34,8 +34,8 @@
struct WebGPUBufferBinding {
RefPtr<WebGPUBuffer> buffer;
- unsigned long offset;
- unsigned long size;
+ unsigned long long offset;
+ unsigned long long size;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl (242163 => 242164)
--- trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl 2019-02-27 22:59:13 UTC (rev 242163)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl 2019-02-27 23:09:19 UTC (rev 242164)
@@ -32,7 +32,6 @@
EnabledAtRuntime=WebGPU,
JSGenerateToJSObject
] interface WebGPURenderPassEncoder : WebGPUProgrammablePassEncoder {
- // FIXME: (<rdar://problem/47717832>) Last argument should be generated to Vector<unsigned long>, but bindings generates Vector<unsigned long long>.
void setVertexBuffers(u32 startSlot, sequence<WebGPUBuffer> buffers, sequence<u64> offsets);
void draw(u32 vertexCount, u32 instanceCount, u32 firstVertex, u32 firstInstance);
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUBufferBinding.h (242163 => 242164)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUBufferBinding.h 2019-02-27 22:59:13 UTC (rev 242163)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUBufferBinding.h 2019-02-27 23:09:19 UTC (rev 242164)
@@ -34,8 +34,8 @@
struct GPUBufferBinding {
Ref<GPUBuffer> buffer;
- unsigned long offset;
- unsigned long size;
+ unsigned long long offset;
+ unsigned long long size;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUVertexAttributeDescriptor.h (242163 => 242164)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUVertexAttributeDescriptor.h 2019-02-27 22:59:13 UTC (rev 242163)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUVertexAttributeDescriptor.h 2019-02-27 23:09:19 UTC (rev 242164)
@@ -46,7 +46,7 @@
struct GPUVertexAttributeDescriptor {
unsigned long shaderLocation;
unsigned long inputSlot;
- unsigned long offset;
+ unsigned long long offset;
GPUVertexFormatEnum format;
};
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUVertexInputDescriptor.h (242163 => 242164)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUVertexInputDescriptor.h 2019-02-27 22:59:13 UTC (rev 242163)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUVertexInputDescriptor.h 2019-02-27 23:09:19 UTC (rev 242164)
@@ -43,7 +43,7 @@
struct GPUVertexInputDescriptor {
unsigned long inputSlot;
- unsigned long stride;
+ unsigned long long stride;
GPUInputStepModeEnum stepMode;
};
