From 6726dae35f7b04822d1dd858d8c70faa68aaa0bf Mon Sep 17 00:00:00 2001
From: litherum <litherum@gmail.com>
Date: Thu, 6 Dec 2018 21:56:14 -0800
Subject: [PATCH] Clean up WebGPUVertexInputDescriptor

Three changes:
- As described in https://github.com/gpuweb/gpuweb/issues/145, inputSlot in the
      WebGPUVertexInputDescriptor should instead be implicitly derived from its
      position in the inputs field.
- The format of each attribute is already present in the shader. We should remove
      the redundant information.
- "Input" is not a very descriptive name. Instead, rename it to be "VertexBuffer".
---
 design/sketch.webidl | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/design/sketch.webidl b/design/sketch.webidl
index 200e4c2738..da83e7e16c 100644
--- a/design/sketch.webidl
+++ b/design/sketch.webidl
@@ -368,13 +368,11 @@ interface WebGPUInputStepMode {
 
 dictionary WebGPUVertexAttributeDescriptor {
     u32 shaderLocation;
-    u32 inputSlot;
+    u32 vertexBufferIndex;
     u32 offset;
-    WebGPUVertexFormatEnum format;
 };
 
-dictionary WebGPUVertexInputDescriptor {
-    u32 inputSlot;
+dictionary WebGPUVertexBufferDescriptor {
     u32 stride;
     WebGPUInputStepModeEnum stepMode;
 };
@@ -383,7 +381,7 @@ dictionary WebGPUInputStateDescriptor {
     WebGPUIndexFormatEnum indexFormat;
 
     sequence<WebGPUVertexAttributeDescriptor> attributes;
-    sequence<WebGPUVertexInputDescriptor> inputs;
+    sequence<WebGPUVertexBufferDescriptor> vertexBuffers;
 };
 
 // ShaderModule
@@ -483,7 +481,7 @@ interface WebGPURenderPassEncoder : WebGPUProgrammablePassEncoder {
     void setScissorRect(u32 x, u32 y, u32 width, u32 height);
 
     void setIndexBuffer(WebGPUBuffer buffer, u32 offset);
-    void setVertexBuffers(u32 startSlot, sequence<WebGPUBuffer> buffers, sequence<u32> offsets);
+    void setVertexBuffers(u32 startVertexBufferIndex, sequence<WebGPUBuffer> buffers, sequence<u32> offsets);
 
     void draw(u32 vertexCount, u32 instanceCount, u32 firstVertex, u32 firstInstance);
     void drawIndexed(u32 indexCount, u32 instanceCount, u32 firstIndex, i32 baseVertex, u32 firstInstance);