diff --git a/examples/CHelloTriangle.cpp b/examples/CHelloTriangle.cpp index e6b96abcaa..935c6617a0 100644 --- a/examples/CHelloTriangle.cpp +++ b/examples/CHelloTriangle.cpp @@ -37,7 +37,7 @@ void init() { wgpuSwapChainConfigure(swapchain, swapChainFormat, WGPUTextureUsage_RenderAttachment, 640, 480); const char* vs = - "[[builtin(vertex_idx)]] var VertexIndex : u32;\n" + "[[builtin(vertex_index)]] var VertexIndex : u32;\n" "[[builtin(position)]] var Position : vec4;\n" "const pos : array, 3> = array, 3>(\n" " vec2( 0.0, 0.5),\n" diff --git a/examples/ManualSwapChainTest.cpp b/examples/ManualSwapChainTest.cpp index a9ee509c04..83ba313cbf 100644 --- a/examples/ManualSwapChainTest.cpp +++ b/examples/ManualSwapChainTest.cpp @@ -313,7 +313,7 @@ int main(int argc, const char* argv[]) { // The hacky pipeline to render a triangle. utils::ComboRenderPipelineDescriptor pipelineDesc(device); pipelineDesc.vertexStage.module = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; const pos : array, 3> = array, 3>( vec2( 0.0, 0.5), diff --git a/src/dawn_native/CopyTextureForBrowserHelper.cpp b/src/dawn_native/CopyTextureForBrowserHelper.cpp index 51b36edbc4..6f65389a1d 100644 --- a/src/dawn_native/CopyTextureForBrowserHelper.cpp +++ b/src/dawn_native/CopyTextureForBrowserHelper.cpp @@ -44,7 +44,7 @@ namespace dawn_native { vec2( 0.5, 2.0)); [[location(0)]] var v_texcoord: vec2; [[builtin(position)]] var Position : vec4; - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[binding(0), group(0)]] var uniforms : Uniforms; [[stage(vertex)]] fn main() -> void { Position = vec4((texcoord[VertexIndex] * 2.0 - vec2(1.0, 1.0)), 0.0, 1.0); diff --git a/src/tests/end2end/BindGroupTests.cpp b/src/tests/end2end/BindGroupTests.cpp index 6f2c51f571..78f9929f94 100644 --- a/src/tests/end2end/BindGroupTests.cpp +++ b/src/tests/end2end/BindGroupTests.cpp @@ -46,7 +46,7 @@ class BindGroupTests : public DawnTest { wgpu::ShaderModule MakeSimpleVSModule() const { return utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { @@ -164,7 +164,7 @@ TEST_P(BindGroupTests, ReusedUBO) { [[group(0), binding(0)]] var vertexUbo : VertexUniformBuffer; - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { @@ -251,7 +251,7 @@ TEST_P(BindGroupTests, UBOSamplerAndTexture) { }; [[group(0), binding(0)]] var vertexUbo : VertexUniformBuffer; - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { @@ -374,7 +374,7 @@ TEST_P(BindGroupTests, MultipleBindLayouts) { [[group(0), binding(0)]] var vertexUbo1 : VertexUniformBuffer1; [[group(1), binding(0)]] var vertexUbo2 : VertexUniformBuffer2; - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { @@ -961,7 +961,7 @@ TEST_P(BindGroupTests, ArbitraryBindingNumbers) { utils::BasicRenderPass renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize); wgpu::ShaderModule vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { @@ -1117,7 +1117,7 @@ TEST_P(BindGroupTests, ReadonlyStorage) { utils::ComboRenderPipelineDescriptor pipelineDescriptor(device); pipelineDescriptor.vertexStage.module = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/BufferZeroInitTests.cpp b/src/tests/end2end/BufferZeroInitTests.cpp index b9273293a8..8bb704125e 100644 --- a/src/tests/end2end/BufferZeroInitTests.cpp +++ b/src/tests/end2end/BufferZeroInitTests.cpp @@ -293,7 +293,7 @@ class BufferZeroInitTest : public DawnTest { CreateRenderPipelineForTest(R"( [[location(0)]] var o_color : vec4; - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/ClipSpaceTests.cpp b/src/tests/end2end/ClipSpaceTests.cpp index fcb019eb62..ff3e08d017 100644 --- a/src/tests/end2end/ClipSpaceTests.cpp +++ b/src/tests/end2end/ClipSpaceTests.cpp @@ -34,7 +34,7 @@ class ClipSpaceTest : public DawnTest { vec3(-1.0, -1.0, 0.5), vec3( 1.0, -1.0, 0.0)); - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp index 79747ee04a..2cc8b58066 100644 --- a/src/tests/end2end/ColorStateTests.cpp +++ b/src/tests/end2end/ColorStateTests.cpp @@ -31,7 +31,7 @@ class ColorStateTest : public DawnTest { DawnTest::SetUp(); vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/CompressedTextureFormatTests.cpp b/src/tests/end2end/CompressedTextureFormatTests.cpp index f953839623..a6b652350e 100644 --- a/src/tests/end2end/CompressedTextureFormatTests.cpp +++ b/src/tests/end2end/CompressedTextureFormatTests.cpp @@ -143,7 +143,7 @@ class CompressedTextureBCFormatTest : public DawnTest { [[builtin(position)]] var Position : vec4; [[location(0)]] var texCoord : vec2 ; - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[stage(vertex)]] fn main() -> void { const pos : array, 3> = array, 3>( diff --git a/src/tests/end2end/CullingTests.cpp b/src/tests/end2end/CullingTests.cpp index e7f62f7688..17570e6ad0 100644 --- a/src/tests/end2end/CullingTests.cpp +++ b/src/tests/end2end/CullingTests.cpp @@ -34,7 +34,7 @@ class CullingTest : public DawnTest { vec2( 1.0, 0.0), vec2( 1.0, -1.0)); - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/DepthBiasTests.cpp b/src/tests/end2end/DepthBiasTests.cpp index 2438c5433b..c5b1b3869a 100644 --- a/src/tests/end2end/DepthBiasTests.cpp +++ b/src/tests/end2end/DepthBiasTests.cpp @@ -36,7 +36,7 @@ class DepthBiasTests : public DawnTest { case QuadAngle::Flat: // Draw a square at z = 0.25 vertexSource = R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { const pos : array, 6> = array, 6>( @@ -54,7 +54,7 @@ class DepthBiasTests : public DawnTest { case QuadAngle::TiltedX: // Draw a square ranging from 0 to 0.5, bottom to top vertexSource = R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { const pos : array, 6> = array, 6>( diff --git a/src/tests/end2end/DepthStencilCopyTests.cpp b/src/tests/end2end/DepthStencilCopyTests.cpp index 47d7ad0df6..936dcaa392 100644 --- a/src/tests/end2end/DepthStencilCopyTests.cpp +++ b/src/tests/end2end/DepthStencilCopyTests.cpp @@ -29,7 +29,7 @@ class DepthStencilCopyTests : public DawnTest { // Draw a square in the bottom left quarter of the screen. mVertexModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { @@ -239,7 +239,7 @@ class DepthStencilCopyTests : public DawnTest { utils::ComboRenderPipelineDescriptor pipelineDescriptor(device); pipelineDescriptor.vertexStage.module = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/DepthStencilStateTests.cpp b/src/tests/end2end/DepthStencilStateTests.cpp index 66fc3a6e14..a80ddb3474 100644 --- a/src/tests/end2end/DepthStencilStateTests.cpp +++ b/src/tests/end2end/DepthStencilStateTests.cpp @@ -58,7 +58,7 @@ class DepthStencilStateTest : public DawnTest { [[offset(12)]] depth : f32; }; [[group(0), binding(0)]] var ubo : UBO; - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/DynamicBufferOffsetTests.cpp b/src/tests/end2end/DynamicBufferOffsetTests.cpp index 3eb70e132a..4f254f38e4 100644 --- a/src/tests/end2end/DynamicBufferOffsetTests.cpp +++ b/src/tests/end2end/DynamicBufferOffsetTests.cpp @@ -94,7 +94,7 @@ class DynamicBufferOffsetTests : public DawnTest { wgpu::RenderPipeline CreateRenderPipeline(bool isInheritedPipeline = false) { wgpu::ShaderModule vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { const pos : array, 3> = array, 3>( diff --git a/src/tests/end2end/FirstIndexOffsetTests.cpp b/src/tests/end2end/FirstIndexOffsetTests.cpp index 241165565a..53019bb8b1 100644 --- a/src/tests/end2end/FirstIndexOffsetTests.cpp +++ b/src/tests/end2end/FirstIndexOffsetTests.cpp @@ -91,7 +91,7 @@ void FirstIndexOffsetTests::TestImpl(DrawMode mode, if ((checkIndex & CheckIndex::Vertex) != 0) { vertexShader << R"( - [[builtin(vertex_idx)]] var vertex_index : u32; + [[builtin(vertex_index)]] var vertex_index : u32; [[location(1)]] var out_vertex_index : u32; )"; fragmentShader << R"( @@ -100,7 +100,7 @@ void FirstIndexOffsetTests::TestImpl(DrawMode mode, } if ((checkIndex & CheckIndex::Instance) != 0) { vertexShader << R"( - [[builtin(instance_idx)]] var instance_index : u32; + [[builtin(instance_index)]] var instance_index : u32; [[location(2)]] var out_instance_index : u32; )"; fragmentShader << R"( diff --git a/src/tests/end2end/IOSurfaceWrappingTests.cpp b/src/tests/end2end/IOSurfaceWrappingTests.cpp index c2c1b72351..f0ebfe2bf3 100644 --- a/src/tests/end2end/IOSurfaceWrappingTests.cpp +++ b/src/tests/end2end/IOSurfaceWrappingTests.cpp @@ -248,7 +248,7 @@ class IOSurfaceUsageTests : public IOSurfaceTestBase { wgpu::RenderPipeline pipeline; { wgpu::ShaderModule vs = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[location(0)]] var o_texCoord : vec2; [[builtin(position)]] var Position : vec4; diff --git a/src/tests/end2end/IndexFormatTests.cpp b/src/tests/end2end/IndexFormatTests.cpp index 3d650399c7..252ad636dc 100644 --- a/src/tests/end2end/IndexFormatTests.cpp +++ b/src/tests/end2end/IndexFormatTests.cpp @@ -34,7 +34,7 @@ class IndexFormatTest : public DawnTest { wgpu::PrimitiveTopology primitiveTopology = wgpu::PrimitiveTopology::TriangleStrip) { wgpu::ShaderModule vsModule = utils::CreateShaderModuleFromWGSL(device, R"( [[location(0)]] var pos : vec4; - [[builtin(vertex_idx)]] var idx : u32; + [[builtin(vertex_index)]] var idx : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { // 0xFFFFFFFE is a designated invalid index used by some tests. diff --git a/src/tests/end2end/QueryTests.cpp b/src/tests/end2end/QueryTests.cpp index ff64300c34..7b768fb4ca 100644 --- a/src/tests/end2end/QueryTests.cpp +++ b/src/tests/end2end/QueryTests.cpp @@ -39,7 +39,7 @@ class OcclusionQueryTests : public QueryTests { DawnTest::SetUp(); vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { const pos : array, 3> = array, 3>( diff --git a/src/tests/end2end/RenderPassLoadOpTests.cpp b/src/tests/end2end/RenderPassLoadOpTests.cpp index 43454e7ec8..1c7d8c16d2 100644 --- a/src/tests/end2end/RenderPassLoadOpTests.cpp +++ b/src/tests/end2end/RenderPassLoadOpTests.cpp @@ -77,7 +77,7 @@ class RenderPassLoadOpTests : public DawnTest { // draws a blue quad on the right half of the screen const char* vsSource = R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/RenderPassTests.cpp b/src/tests/end2end/RenderPassTests.cpp index 0594aa5140..f3857f53d2 100644 --- a/src/tests/end2end/RenderPassTests.cpp +++ b/src/tests/end2end/RenderPassTests.cpp @@ -27,7 +27,7 @@ class RenderPassTest : public DawnTest { // Shaders to draw a bottom-left triangle in blue. mVSModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/SamplerTests.cpp b/src/tests/end2end/SamplerTests.cpp index bb7f7e6354..8b4919f24d 100644 --- a/src/tests/end2end/SamplerTests.cpp +++ b/src/tests/end2end/SamplerTests.cpp @@ -55,7 +55,7 @@ class SamplerTest : public DawnTest { mRenderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize); auto vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/ScissorTests.cpp b/src/tests/end2end/ScissorTests.cpp index f07a4b1d42..0c68ee0032 100644 --- a/src/tests/end2end/ScissorTests.cpp +++ b/src/tests/end2end/ScissorTests.cpp @@ -21,9 +21,9 @@ class ScissorTest : public DawnTest { protected: wgpu::RenderPipeline CreateQuadPipeline(wgpu::TextureFormat format) { wgpu::ShaderModule vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; - + const pos : array, 6> = array, 6>( vec2(-1.0, -1.0), vec2(-1.0, 1.0), diff --git a/src/tests/end2end/TextureFormatTests.cpp b/src/tests/end2end/TextureFormatTests.cpp index 0675cc22a3..baa05bb5a7 100644 --- a/src/tests/end2end/TextureFormatTests.cpp +++ b/src/tests/end2end/TextureFormatTests.cpp @@ -147,7 +147,7 @@ class TextureFormatTest : public DawnTest { utils::ComboRenderPipelineDescriptor desc(device); wgpu::ShaderModule vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/TextureSubresourceTests.cpp b/src/tests/end2end/TextureSubresourceTests.cpp index e58df56595..fa4e7ddb82 100644 --- a/src/tests/end2end/TextureSubresourceTests.cpp +++ b/src/tests/end2end/TextureSubresourceTests.cpp @@ -50,7 +50,7 @@ class TextureSubresourceTest : public DawnTest { void DrawTriangle(const wgpu::TextureView& view) { wgpu::ShaderModule vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { @@ -90,7 +90,7 @@ class TextureSubresourceTest : public DawnTest { void SampleAndDraw(const wgpu::TextureView& samplerView, const wgpu::TextureView& renderView) { wgpu::ShaderModule vsModule = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; [[stage(vertex)]] fn main() -> void { diff --git a/src/tests/end2end/ViewportTests.cpp b/src/tests/end2end/ViewportTests.cpp index b692b1a5ea..03e477b030 100644 --- a/src/tests/end2end/ViewportTests.cpp +++ b/src/tests/end2end/ViewportTests.cpp @@ -23,7 +23,7 @@ class ViewportTest : public DawnTest { DawnTest::SetUp(); mQuadVS = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; const pos : array, 6> = array, 6>( @@ -96,7 +96,7 @@ class ViewportTest : public DawnTest { // Create a pipeline drawing 3 points at depth 1.0, 0.5 and 0.0. utils::ComboRenderPipelineDescriptor pipelineDesc(device); pipelineDesc.vertexStage.module = utils::CreateShaderModuleFromWGSL(device, R"( - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[builtin(position)]] var Position : vec4; const points : array, 3> = array, 3>( diff --git a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp index 3637673e9e..2aba3e09e7 100644 --- a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp +++ b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp @@ -475,7 +475,7 @@ TEST_F(RenderPipelineValidationTest, StorageBufferInVertexShaderNoLayout) { [[offset(0)]] data : [[stride(4)]] array; }; [[group(0), binding(0)]] var dst : [[access(read_write)]] Dst; - [[builtin(vertex_idx)]] var VertexIndex : u32; + [[builtin(vertex_index)]] var VertexIndex : u32; [[stage(vertex)]] fn main() -> void { dst.data[VertexIndex] = 0x1234u; })");