Diff
Modified: trunk/Source/WebCore/ChangeLog (243635 => 243636)
--- trunk/Source/WebCore/ChangeLog 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/ChangeLog 2019-03-29 02:19:37 UTC (rev 243636)
@@ -1,3 +1,50 @@
+2019-03-28 Justin Fan <justin_...@apple.com>
+
+ [Web GPU] Replace 'unsigned long' with 'unsigned' when implementing u32 variables
+ https://bugs.webkit.org/show_bug.cgi?id=194618
+ <rdar://problem/48055796>
+
+ Reviewed by Myles C. Maxfield.
+
+ WebIDL for "unsigned" on 64-bit is "unsigned long". Update Web GPU to match.
+
+ No new tests; no change in behavior.
+
+ * Modules/webgpu/GPUBindGroupLayoutBinding.h:
+ * Modules/webgpu/WHLSL/Metal/WHLSLVertexBufferIndexCalculator.cpp:
+ (WebCore::WHLSL::Metal::calculateVertexBufferIndex):
+ * Modules/webgpu/WHLSL/Metal/WHLSLVertexBufferIndexCalculator.h:
+ * Modules/webgpu/WebGPUBindGroupBinding.h:
+ * Modules/webgpu/WebGPUBindGroupDescriptor.cpp:
+ (WebCore::validateBufferBindingType):
+ (WebCore::WebGPUBindGroupDescriptor::tryCreateGPUBindGroupDescriptor const):
+ * Modules/webgpu/WebGPUBuffer.cpp:
+ (WebCore::WebGPUBuffer::setSubData):
+ * Modules/webgpu/WebGPUBuffer.h:
+ * Modules/webgpu/WebGPUBufferBinding.h:
+ * Modules/webgpu/WebGPURenderPassEncoder.cpp:
+ (WebCore::WebGPURenderPassEncoder::setVertexBuffers):
+ (WebCore::WebGPURenderPassEncoder::draw):
+ * Modules/webgpu/WebGPURenderPassEncoder.h:
+ * platform/graphics/gpu/GPUBindGroupBinding.h:
+ * platform/graphics/gpu/GPUBindGroupLayout.h:
+ * platform/graphics/gpu/GPUBufferBinding.h:
+ * platform/graphics/gpu/GPUExtent3D.h:
+ * platform/graphics/gpu/GPULimits.h:
+ * platform/graphics/gpu/GPURenderPassEncoder.h:
+ * platform/graphics/gpu/GPUTextureDescriptor.h:
+ * platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm:
+ (WebCore::GPUBindGroupLayout::tryCreate):
+ * platform/graphics/gpu/cocoa/GPUBindGroupMetal.mm:
+ (WebCore::GPUBindGroup::tryCreate):
+ * platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm:
+ (WebCore::GPURenderPassEncoder::setVertexBuffers):
+ (WebCore::GPURenderPassEncoder::draw):
+ * platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm:
+ (WebCore::trySetInputStateForPipelineDescriptor):
+ * platform/graphics/gpu/cocoa/GPUTextureMetal.mm:
+ (WebCore::storageModeForPixelFormatAndSampleCount):
+
2019-03-28 Ryosuke Niwa <rn...@webkit.org>
getBoundingClientRect always returns empty rect on a collapsed range
Modified: trunk/Source/WebCore/Modules/webgpu/GPUBindGroupLayoutBinding.h (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/GPUBindGroupLayoutBinding.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/GPUBindGroupLayoutBinding.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -41,7 +41,7 @@
};
struct GPUBindGroupLayoutBinding {
- unsigned long binding;
+ unsigned binding;
GPUShaderStageFlags visibility;
GPUBindingType type;
};
Modified: trunk/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLVertexBufferIndexCalculator.cpp (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLVertexBufferIndexCalculator.cpp 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLVertexBufferIndexCalculator.cpp 2019-03-29 02:19:37 UTC (rev 243636)
@@ -34,7 +34,7 @@
namespace Metal {
-unsigned long calculateVertexBufferIndex(unsigned long index)
+unsigned calculateVertexBufferIndex(unsigned index)
{
// Reserve the first few MTLBuffer slots for argument buffers for GPUBindGroups.
return index + 8;
Modified: trunk/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLVertexBufferIndexCalculator.h (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLVertexBufferIndexCalculator.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLVertexBufferIndexCalculator.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -33,7 +33,7 @@
namespace Metal {
-unsigned long calculateVertexBufferIndex(unsigned long);
+unsigned calculateVertexBufferIndex(unsigned);
}
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUBindGroupBinding.h (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUBindGroupBinding.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUBindGroupBinding.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -37,7 +37,7 @@
using WebGPUBindingResource = Variant<RefPtr<WebGPUSampler>, RefPtr<WebGPUTextureView>, WebGPUBufferBinding>;
struct WebGPUBindGroupBinding {
- unsigned long binding;
+ unsigned binding;
WebGPUBindingResource resource;
};
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUBindGroupDescriptor.cpp (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUBindGroupDescriptor.cpp 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUBindGroupDescriptor.cpp 2019-03-29 02:19:37 UTC (rev 243636)
@@ -44,18 +44,18 @@
switch (binding.type) {
case GPUBindingType::UniformBuffer:
if (!buffer->isUniform()) {
- LOG(WebGPU, "%s: GPUBuffer resource for binding %lu does not have UNIFORM usage!", functionName, binding.binding);
+ LOG(WebGPU, "%s: GPUBuffer resource for binding %u does not have UNIFORM usage!", functionName, binding.binding);
return false;
}
return true;
case GPUBindingType::StorageBuffer:
if (!buffer->isStorage()) {
- LOG(WebGPU, "%s: GPUBuffer resource for binding %lu does not have STORAGE usage!", functionName, binding.binding);
+ LOG(WebGPU, "%s: GPUBuffer resource for binding %u does not have STORAGE usage!", functionName, binding.binding);
return false;
}
return true;
default:
- LOG(WebGPU, "%s: Layout binding %lu is not a buffer-type resource!", functionName, binding.binding);
+ LOG(WebGPU, "%s: Layout binding %u is not a buffer-type resource!", functionName, binding.binding);
return false;
}
}
@@ -82,7 +82,7 @@
for (const auto& binding : bindings) {
auto iterator = layoutMap.find(binding.binding);
if (iterator == layoutMap.end()) {
- LOG(WebGPU, "%s: GPUBindGroupLayoutBinding %lu not found in GPUBindGroupLayout!", functionName, binding.binding);
+ LOG(WebGPU, "%s: GPUBindGroupLayoutBinding %u not found in GPUBindGroupLayout!", functionName, binding.binding);
return WTF::nullopt;
}
@@ -119,7 +119,7 @@
auto bindingResource = WTF::visit(bindingResourceVisitor, binding.resource);
if (!bindingResource) {
- LOG(WebGPU, "%s: Invalid resource for binding %lu!", functionName, layoutBinding.binding);
+ LOG(WebGPU, "%s: Invalid resource for binding %u!", functionName, layoutBinding.binding);
return WTF::nullopt;
}
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.cpp (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.cpp 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.cpp 2019-03-29 02:19:37 UTC (rev 243636)
@@ -42,7 +42,7 @@
{
}
-void WebGPUBuffer::setSubData(unsigned long long offset, const JSC::ArrayBuffer& data)
+void WebGPUBuffer::setSubData(unsigned long offset, const JSC::ArrayBuffer& data)
{
if (!m_buffer)
LOG(WebGPU, "GPUBuffer::setSubData(): Invalid operation!");
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.h (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -48,7 +48,7 @@
GPUBuffer* buffer() { return m_buffer.get(); }
const GPUBuffer* buffer() const { return m_buffer.get(); }
- void setSubData(unsigned long long, const JSC::ArrayBuffer&);
+ void setSubData(unsigned long, const JSC::ArrayBuffer&);
using BufferMappingPromise = DOMPromiseDeferred<IDLInterface<JSC::ArrayBuffer>>;
void mapReadAsync(BufferMappingPromise&&);
void mapWriteAsync(BufferMappingPromise&&);
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUBufferBinding.h (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUBufferBinding.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUBufferBinding.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -34,8 +34,8 @@
struct WebGPUBufferBinding {
RefPtr<WebGPUBuffer> buffer;
- unsigned long long offset;
- unsigned long long size;
+ unsigned long offset;
+ unsigned long size;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.cpp (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.cpp 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.cpp 2019-03-29 02:19:37 UTC (rev 243636)
@@ -60,7 +60,7 @@
m_passEncoder->setPipeline(makeRef(*pipeline.renderPipeline()));
}
-void WebGPURenderPassEncoder::setVertexBuffers(unsigned long startSlot, Vector<RefPtr<WebGPUBuffer>>&& buffers, Vector<unsigned long long>&& offsets)
+void WebGPURenderPassEncoder::setVertexBuffers(unsigned startSlot, Vector<RefPtr<WebGPUBuffer>>&& buffers, Vector<unsigned long long>&& offsets)
{
#if !LOG_DISABLED
const char* const functionName = "GPURenderPassEncoder::setVertexBuffers()";
@@ -74,7 +74,7 @@
return;
}
if (startSlot + buffers.size() > maxVertexBuffers) {
- LOG(WebGPU, "%s: Invalid startSlot %lu for %lu buffers!", functionName, startSlot, buffers.size());
+ LOG(WebGPU, "%s: Invalid startSlot %u for %lu buffers!", functionName, startSlot, buffers.size());
return;
}
@@ -98,7 +98,7 @@
m_passEncoder->setVertexBuffers(startSlot, WTFMove(gpuBuffers), WTFMove(offsets));
}
-void WebGPURenderPassEncoder::draw(unsigned long vertexCount, unsigned long instanceCount, unsigned long firstVertex, unsigned long firstInstance)
+void WebGPURenderPassEncoder::draw(unsigned vertexCount, unsigned instanceCount, unsigned firstVertex, unsigned firstInstance)
{
if (!m_passEncoder) {
LOG(WebGPU, "GPURenderPassEncoder::draw(): Invalid operation!");
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.h (243635 => 243636)
--- trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -43,8 +43,8 @@
static Ref<WebGPURenderPassEncoder> create(RefPtr<GPURenderPassEncoder>&&);
void setPipeline(const WebGPURenderPipeline&);
- void setVertexBuffers(unsigned long, Vector<RefPtr<WebGPUBuffer>>&&, Vector<unsigned long long>&&);
- void draw(unsigned long vertexCount, unsigned long instanceCount, unsigned long firstVertex, unsigned long firstInstance);
+ void setVertexBuffers(unsigned, Vector<RefPtr<WebGPUBuffer>>&&, Vector<unsigned long long>&&);
+ void draw(unsigned vertexCount, unsigned instanceCount, unsigned firstVertex, unsigned firstInstance);
private:
WebGPURenderPassEncoder(RefPtr<GPURenderPassEncoder>&&);
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUBindGroupBinding.h (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUBindGroupBinding.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUBindGroupBinding.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -37,7 +37,7 @@
using GPUBindingResource = Variant<Ref<const GPUSampler>, Ref<GPUTexture>, GPUBufferBinding>;
struct GPUBindGroupBinding {
- unsigned long binding;
+ unsigned binding;
GPUBindingResource resource;
};
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -47,7 +47,7 @@
public:
static RefPtr<GPUBindGroupLayout> tryCreate(const GPUDevice&, const GPUBindGroupLayoutDescriptor&);
- using BindingsMapType = HashMap<unsigned long long, GPUBindGroupLayoutBinding, WTF::IntHash<unsigned long long>, WTF::UnsignedWithZeroKeyHashTraits<unsigned long long>>;
+ using BindingsMapType = HashMap<unsigned long, GPUBindGroupLayoutBinding, WTF::IntHash<unsigned long>, WTF::UnsignedWithZeroKeyHashTraits<unsigned long>>;
const BindingsMapType& bindingsMap() const { return m_bindingsMap; }
#if USE(METAL)
MTLArgumentEncoder *vertexEncoder() const { return m_vertexEncoder.get(); }
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUBufferBinding.h (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUBufferBinding.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUBufferBinding.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -34,8 +34,8 @@
struct GPUBufferBinding {
Ref<GPUBuffer> buffer;
- unsigned long long offset;
- unsigned long long size;
+ unsigned long offset;
+ unsigned long size;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUExtent3D.h (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUExtent3D.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUExtent3D.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -30,9 +30,9 @@
namespace WebCore {
struct GPUExtent3D {
- unsigned long width;
- unsigned long height;
- unsigned long depth;
+ unsigned width;
+ unsigned height;
+ unsigned depth;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPULimits.h (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/GPULimits.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPULimits.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -29,7 +29,7 @@
namespace WebCore {
-const unsigned long maxVertexBuffers = 16;
+const unsigned maxVertexBuffers = 16;
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassEncoder.h (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassEncoder.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassEncoder.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -52,8 +52,8 @@
static RefPtr<GPURenderPassEncoder> tryCreate(Ref<GPUCommandBuffer>&&, GPURenderPassDescriptor&&);
void setPipeline(Ref<const GPURenderPipeline>&&);
- void setVertexBuffers(unsigned long, Vector<Ref<GPUBuffer>>&&, Vector<unsigned long long>&&);
- void draw(unsigned long vertexCount, unsigned long instanceCount, unsigned long firstVertex, unsigned long firstInstance);
+ void setVertexBuffers(unsigned, Vector<Ref<GPUBuffer>>&&, Vector<unsigned long long>&&);
+ void draw(unsigned vertexCount, unsigned instanceCount, unsigned firstVertex, unsigned firstInstance);
private:
GPURenderPassEncoder(Ref<GPUCommandBuffer>&&, PlatformRenderPassEncoderSmartPtr&&);
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUTextureDescriptor.h (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUTextureDescriptor.h 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUTextureDescriptor.h 2019-03-29 02:19:37 UTC (rev 243636)
@@ -41,9 +41,9 @@
struct GPUTextureDescriptor {
GPUExtent3D size;
- unsigned long arrayLayerCount;
- unsigned long mipLevelCount;
- unsigned long sampleCount;
+ unsigned arrayLayerCount;
+ unsigned mipLevelCount;
+ unsigned sampleCount;
GPUTextureDimension dimension;
GPUTextureFormat format;
GPUTextureUsageFlags usage;
Modified: trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm 2019-03-29 02:19:37 UTC (rev 243636)
@@ -89,7 +89,7 @@
for (const auto& binding : descriptor.bindings) {
if (!bindingsMap.add(binding.binding, binding)) {
- LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Duplicate binding %lu found in GPUBindGroupLayoutDescriptor!", binding.binding);
+ LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Duplicate binding %u found in GPUBindGroupLayoutDescriptor!", binding.binding);
return nullptr;
}
@@ -99,7 +99,7 @@
mtlArgument = adoptNS([MTLArgumentDescriptor new]);
END_BLOCK_OBJC_EXCEPTIONS;
if (!mtlArgument) {
- LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Unable to create MTLArgumentDescriptor for binding %lu!", binding.binding);
+ LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Unable to create MTLArgumentDescriptor for binding %u!", binding.binding);
return nullptr;
}
Modified: trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupMetal.mm (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupMetal.mm 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupMetal.mm 2019-03-29 02:19:37 UTC (rev 243636)
@@ -160,7 +160,7 @@
auto index = resourceBinding.binding;
auto layoutIterator = layoutBindingsMap.find(index);
if (layoutIterator == layoutBindingsMap.end()) {
- LOG(WebGPU, "%s: GPUBindGroupBinding %lu not found in GPUBindGroupLayout!", functionName, index);
+ LOG(WebGPU, "%s: GPUBindGroupBinding %u not found in GPUBindGroupLayout!", functionName, index);
return nullptr;
}
auto layoutBinding = layoutIterator->value;
@@ -172,15 +172,15 @@
bool isForCompute = layoutBinding.visibility & GPUShaderStageBit::Flags::Compute;
if (isForVertex && !vertexEncoder) {
- LOG(WebGPU, "%s: No vertex argument encoder found for binding %lu!", functionName, index);
+ LOG(WebGPU, "%s: No vertex argument encoder found for binding %u!", functionName, index);
return nullptr;
}
if (isForFragment && !fragmentEncoder) {
- LOG(WebGPU, "%s: No fragment argument encoder found for binding %lu!", functionName, index);
+ LOG(WebGPU, "%s: No fragment argument encoder found for binding %u!", functionName, index);
return nullptr;
}
if (isForCompute && !computeEncoder) {
- LOG(WebGPU, "%s: No compute argument encoder found for binding %lu!", functionName, index);
+ LOG(WebGPU, "%s: No compute argument encoder found for binding %u!", functionName, index);
return nullptr;
}
Modified: trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm 2019-03-29 02:19:37 UTC (rev 243636)
@@ -204,7 +204,7 @@
m_pipeline = WTFMove(pipeline);
}
-void GPURenderPassEncoder::setVertexBuffers(unsigned long index, Vector<Ref<GPUBuffer>>&& buffers, Vector<unsigned long long>&& offsets)
+void GPURenderPassEncoder::setVertexBuffers(unsigned index, Vector<Ref<GPUBuffer>>&& buffers, Vector<unsigned long long>&& offsets)
{
if (!m_platformRenderPassEncoder) {
LOG(WebGPU, "GPURenderPassEncoder::setVertexBuffers(): Invalid operation: Encoding is ended!");
@@ -245,7 +245,7 @@
ASSERT_NOT_REACHED();
}
-void GPURenderPassEncoder::draw(unsigned long vertexCount, unsigned long instanceCount, unsigned long firstVertex, unsigned long firstInstance)
+void GPURenderPassEncoder::draw(unsigned vertexCount, unsigned instanceCount, unsigned firstVertex, unsigned firstInstance)
{
if (!m_platformRenderPassEncoder) {
LOG(WebGPU, "GPURenderPassEncoder::draw(): Invalid operation: Encoding is ended!");
Modified: trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm 2019-03-29 02:19:37 UTC (rev 243636)
@@ -331,11 +331,11 @@
auto location = attributes[i].shaderLocation;
// Maximum number of vertex attributes to be supported by Web GPU.
if (location >= 16) {
- LOG(WebGPU, "%s: Invalid shaderLocation %lu for vertex attribute!", functionName, location);
+ LOG(WebGPU, "%s: Invalid shaderLocation %u for vertex attribute!", functionName, location);
return false;
}
if (attributes[i].inputSlot >= maxVertexBuffers) {
- LOG(WebGPU, "%s: Invalid inputSlot %lu for vertex attribute %lu!", functionName, attributes[i].inputSlot, location);
+ LOG(WebGPU, "%s: Invalid inputSlot %u for vertex attribute %u!", functionName, attributes[i].inputSlot, location);
return false;
}
Modified: trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUTextureMetal.mm (243635 => 243636)
--- trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUTextureMetal.mm 2019-03-29 01:56:51 UTC (rev 243635)
+++ trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUTextureMetal.mm 2019-03-29 02:19:37 UTC (rev 243636)
@@ -83,7 +83,7 @@
}
#if !PLATFORM(MAC)
-static MTLStorageMode storageModeForPixelFormatAndSampleCount(MTLPixelFormat format, unsigned long samples)
+static MTLStorageMode storageModeForPixelFormatAndSampleCount(MTLPixelFormat format, unsigned samples)
{
// Depth, Stencil, DepthStencil, and Multisample textures must be allocated with the MTLStorageModePrivate resource option.
if (format == MTLPixelFormatDepth32Float_Stencil8 || samples > 1)
