Changeset 244297 in webkit

Timestamp:

Apr 15, 2019, 2:58:14 PM (7 years ago)

Author:

Justin Fan

Message:

Let WTF::convertSafely deduce types from arguments.

Reviewer's (Darin Adler) follow-up to ​https://bugs.webkit.org/show_bug.cgi?id=196793.

• platform/graphics/gpu/cocoa/GPUBufferMetal.mm:

(WebCore::GPUBuffer::tryCreate):

• platform/graphics/gpu/cocoa/GPUCommandBufferMetal.mm:

(WebCore::GPUCommandBuffer::copyBufferToTexture):
(WebCore::GPUCommandBuffer::copyTextureToBuffer):

• platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm:

(WebCore::trySetInputStateForPipelineDescriptor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gpu/cocoa/GPUBufferMetal.mm (modified) (1 diff)
• platform/graphics/gpu/cocoa/GPUCommandBufferMetal.mm (modified) (2 diffs)
• platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-15  Justin Fan  <justin_fan@apple.com>
+
+        Let WTF::convertSafely deduce types from arguments.
+
+        Reviewer's (Darin Adler) follow-up to https://bugs.webkit.org/show_bug.cgi?id=196793.
+
+        * platform/graphics/gpu/cocoa/GPUBufferMetal.mm:
+        (WebCore::GPUBuffer::tryCreate):
+        * platform/graphics/gpu/cocoa/GPUCommandBufferMetal.mm:
+        (WebCore::GPUCommandBuffer::copyBufferToTexture):
+        (WebCore::GPUCommandBuffer::copyTextureToBuffer):
+        * platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm:
+        (WebCore::trySetInputStateForPipelineDescriptor):
+
 2019-04-12  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUBufferMetal.mm

@@ -67 +67 @@
     // MTLBuffer size (NSUInteger) is 32 bits on some platforms.
     NSUInteger size = 0;
-    if (!WTF::convertSafely<NSUInteger, uint64_t>(descriptor.size, size)) {
+    if (!WTF::convertSafely(descriptor.size, size)) {
         LOG(WebGPU, "GPUBuffer::tryCreate(): Buffer size is too large!");
         return nullptr;

trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUCommandBufferMetal.mm

@@ -142 +142 @@
     // MTLBuffer size (NSUInteger) is 32 bits on some platforms.
     NSUInteger sourceOffset = 0;
-    if (!WTF::convertSafely<NSUInteger, uint64_t>(srcBuffer.offset, sourceOffset)) {
+    if (!WTF::convertSafely(srcBuffer.offset, sourceOffset)) {
         LOG(WebGPU, "GPUCommandBuffer::copyBufferToTexture(): Source offset is too large!");
         return;
@@ -186 +186 @@
     // MTLBuffer size (NSUInteger) is 32 bits on some platforms.
     NSUInteger destinationOffset = 0;
-    if (!WTF::convertSafely<NSUInteger, uint64_t>(dstBuffer.offset, destinationOffset)) {
+    if (!WTF::convertSafely(dstBuffer.offset, destinationOffset)) {
         LOG(WebGPU, "GPUCommandBuffer::copyTextureToBuffer(): Destination offset is too large!");
         return;

trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPipelineMetal.mm

@@ -344 +344 @@
         // FIXME: Ensure offset < buffer's stride + format's data size.
         NSUInteger attributeOffset = 0;
-        if (!WTF::convertSafely<NSUInteger, uint64_t>(attributes[i].offset, attributeOffset)) {
+        if (!WTF::convertSafely(attributes[i].offset, attributeOffset)) {
             LOG(WebGPU, "%s: Buffer offset for vertex attribute %u is too large!", functionName, location);
             return false;
@@ -366 +366 @@
         }
         NSUInteger inputStride = 0;
-        if (!WTF::convertSafely<NSUInteger, uint64_t>(inputs[j].stride, inputStride)) {
+        if (!WTF::convertSafely(inputs[j].stride, inputStride)) {
             LOG(WebGPU, "%s: Stride for vertex buffer slot %d is too large!", functionName, slot);
             return false;