Add .gitattributes to normalize EOL
BUG=
Change-Id: I7b77180eaf440f9d1894216e5a1a0b56af1de2cf
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8860
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
diff --git a/src/tests/end2end/DestroyTests.cpp b/src/tests/end2end/DestroyTests.cpp
index 752aba4..fdd968f 100644
--- a/src/tests/end2end/DestroyTests.cpp
+++ b/src/tests/end2end/DestroyTests.cpp
@@ -1,160 +1,160 @@
-// Copyright 2019 The Dawn Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "tests/DawnTest.h"
-
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/DawnHelpers.h"
-
-constexpr uint32_t kRTSize = 4;
-
-class DestroyTest : public DawnTest {
- protected:
- void SetUp() override {
- DawnTest::SetUp();
-
- renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
-
- dawn::ShaderModule vsModule =
- utils::CreateShaderModule(device, utils::ShaderStage::Vertex, R"(
- #version 450
- layout(location = 0) in vec4 pos;
- void main() {
- gl_Position = pos;
- })");
-
- dawn::ShaderModule fsModule =
- utils::CreateShaderModule(device, utils::ShaderStage::Fragment, R"(
- #version 450
- layout(location = 0) out vec4 fragColor;
- void main() {
- fragColor = vec4(0.0, 1.0, 0.0, 1.0);
- })");
-
- utils::ComboRenderPipelineDescriptor descriptor(device);
- descriptor.cVertexStage.module = vsModule;
- descriptor.cFragmentStage.module = fsModule;
- descriptor.primitiveTopology = dawn::PrimitiveTopology::TriangleStrip;
- descriptor.cVertexInput.bufferCount = 1;
- descriptor.cVertexInput.cBuffers[0].stride = 4 * sizeof(float);
- descriptor.cVertexInput.cBuffers[0].attributeCount = 1;
- descriptor.cVertexInput.cAttributes[0].format = dawn::VertexFormat::Float4;
- descriptor.cColorStates[0]->format = renderPass.colorFormat;
-
- pipeline = device.CreateRenderPipeline(&descriptor);
-
- vertexBuffer = utils::CreateBufferFromData<float>(
- device, dawn::BufferUsageBit::Vertex,
- {// The bottom left triangle
- -1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f, 0.0f, 1.0f});
-
- dawn::CommandEncoder encoder = device.CreateCommandEncoder();
- encoder.BeginRenderPass(&renderPass.renderPassInfo).EndPass();
- dawn::CommandBuffer commands = encoder.Finish();
- queue.Submit(1, &commands);
- }
-
- utils::BasicRenderPass renderPass;
- dawn::RenderPipeline pipeline;
- dawn::Buffer vertexBuffer;
-
- dawn::CommandBuffer CreateTriangleCommandBuffer() {
- uint64_t zeroOffset = 0;
- dawn::CommandEncoder encoder = device.CreateCommandEncoder();
- {
- dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
- pass.SetPipeline(pipeline);
- pass.SetVertexBuffers(0, 1, &vertexBuffer, &zeroOffset);
- pass.Draw(3, 1, 0, 0);
- pass.EndPass();
- }
- dawn::CommandBuffer commands = encoder.Finish();
- return commands;
- }
-};
-
-// Destroy before submit will result in error, and nothing drawn
-TEST_P(DestroyTest, BufferDestroyBeforeSubmit) {
- RGBA8 notFilled(0, 0, 0, 0);
-
- dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
- vertexBuffer.Destroy();
- ASSERT_DEVICE_ERROR(queue.Submit(1, &commands));
-
- EXPECT_PIXEL_RGBA8_EQ(notFilled, renderPass.color, 1, 3);
-}
-
-// Destroy after submit will draw successfully
-TEST_P(DestroyTest, BufferDestroyAfterSubmit) {
- RGBA8 filled(0, 255, 0, 255);
-
- dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
- queue.Submit(1, &commands);
-
- EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
- vertexBuffer.Destroy();
-}
-
-// First submit succeeds, draws triangle, second submit fails
-// after destroy is called on the buffer, pixel does not change
-TEST_P(DestroyTest, BufferSubmitDestroySubmit) {
- RGBA8 filled(0, 255, 0, 255);
-
- dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
- queue.Submit(1, &commands);
- EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
-
- vertexBuffer.Destroy();
-
- // Submit fails because vertex buffer was destroyed
- ASSERT_DEVICE_ERROR(queue.Submit(1, &commands));
-
- // Pixel stays the same
- EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
-}
-
-// Destroy texture before submit should fail submit
-TEST_P(DestroyTest, TextureDestroyBeforeSubmit) {
- dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
- renderPass.color.Destroy();
- ASSERT_DEVICE_ERROR(queue.Submit(1, &commands));
-}
-
-// Destroy after submit will draw successfully
-TEST_P(DestroyTest, TextureDestroyAfterSubmit) {
- RGBA8 filled(0, 255, 0, 255);
-
- dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
- queue.Submit(1, &commands);
-
- EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
- renderPass.color.Destroy();
-}
-
-// First submit succeeds, draws triangle, second submit fails
-// after destroy is called on the texture
-TEST_P(DestroyTest, TextureSubmitDestroySubmit) {
- RGBA8 filled(0, 255, 0, 255);
-
- dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
- queue.Submit(1, &commands);
- EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
-
- renderPass.color.Destroy();
-
- // Submit fails because texture was destroyed
- ASSERT_DEVICE_ERROR(queue.Submit(1, &commands));
-}
-
-DAWN_INSTANTIATE_TEST(DestroyTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend);
+// Copyright 2019 The Dawn Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "tests/DawnTest.h"
+
+#include "utils/ComboRenderPipelineDescriptor.h"
+#include "utils/DawnHelpers.h"
+
+constexpr uint32_t kRTSize = 4;
+
+class DestroyTest : public DawnTest {
+ protected:
+ void SetUp() override {
+ DawnTest::SetUp();
+
+ renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
+
+ dawn::ShaderModule vsModule =
+ utils::CreateShaderModule(device, utils::ShaderStage::Vertex, R"(
+ #version 450
+ layout(location = 0) in vec4 pos;
+ void main() {
+ gl_Position = pos;
+ })");
+
+ dawn::ShaderModule fsModule =
+ utils::CreateShaderModule(device, utils::ShaderStage::Fragment, R"(
+ #version 450
+ layout(location = 0) out vec4 fragColor;
+ void main() {
+ fragColor = vec4(0.0, 1.0, 0.0, 1.0);
+ })");
+
+ utils::ComboRenderPipelineDescriptor descriptor(device);
+ descriptor.cVertexStage.module = vsModule;
+ descriptor.cFragmentStage.module = fsModule;
+ descriptor.primitiveTopology = dawn::PrimitiveTopology::TriangleStrip;
+ descriptor.cVertexInput.bufferCount = 1;
+ descriptor.cVertexInput.cBuffers[0].stride = 4 * sizeof(float);
+ descriptor.cVertexInput.cBuffers[0].attributeCount = 1;
+ descriptor.cVertexInput.cAttributes[0].format = dawn::VertexFormat::Float4;
+ descriptor.cColorStates[0]->format = renderPass.colorFormat;
+
+ pipeline = device.CreateRenderPipeline(&descriptor);
+
+ vertexBuffer = utils::CreateBufferFromData<float>(
+ device, dawn::BufferUsageBit::Vertex,
+ {// The bottom left triangle
+ -1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f, 0.0f, 1.0f});
+
+ dawn::CommandEncoder encoder = device.CreateCommandEncoder();
+ encoder.BeginRenderPass(&renderPass.renderPassInfo).EndPass();
+ dawn::CommandBuffer commands = encoder.Finish();
+ queue.Submit(1, &commands);
+ }
+
+ utils::BasicRenderPass renderPass;
+ dawn::RenderPipeline pipeline;
+ dawn::Buffer vertexBuffer;
+
+ dawn::CommandBuffer CreateTriangleCommandBuffer() {
+ uint64_t zeroOffset = 0;
+ dawn::CommandEncoder encoder = device.CreateCommandEncoder();
+ {
+ dawn::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo);
+ pass.SetPipeline(pipeline);
+ pass.SetVertexBuffers(0, 1, &vertexBuffer, &zeroOffset);
+ pass.Draw(3, 1, 0, 0);
+ pass.EndPass();
+ }
+ dawn::CommandBuffer commands = encoder.Finish();
+ return commands;
+ }
+};
+
+// Destroy before submit will result in error, and nothing drawn
+TEST_P(DestroyTest, BufferDestroyBeforeSubmit) {
+ RGBA8 notFilled(0, 0, 0, 0);
+
+ dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
+ vertexBuffer.Destroy();
+ ASSERT_DEVICE_ERROR(queue.Submit(1, &commands));
+
+ EXPECT_PIXEL_RGBA8_EQ(notFilled, renderPass.color, 1, 3);
+}
+
+// Destroy after submit will draw successfully
+TEST_P(DestroyTest, BufferDestroyAfterSubmit) {
+ RGBA8 filled(0, 255, 0, 255);
+
+ dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
+ queue.Submit(1, &commands);
+
+ EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
+ vertexBuffer.Destroy();
+}
+
+// First submit succeeds, draws triangle, second submit fails
+// after destroy is called on the buffer, pixel does not change
+TEST_P(DestroyTest, BufferSubmitDestroySubmit) {
+ RGBA8 filled(0, 255, 0, 255);
+
+ dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
+ queue.Submit(1, &commands);
+ EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
+
+ vertexBuffer.Destroy();
+
+ // Submit fails because vertex buffer was destroyed
+ ASSERT_DEVICE_ERROR(queue.Submit(1, &commands));
+
+ // Pixel stays the same
+ EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
+}
+
+// Destroy texture before submit should fail submit
+TEST_P(DestroyTest, TextureDestroyBeforeSubmit) {
+ dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
+ renderPass.color.Destroy();
+ ASSERT_DEVICE_ERROR(queue.Submit(1, &commands));
+}
+
+// Destroy after submit will draw successfully
+TEST_P(DestroyTest, TextureDestroyAfterSubmit) {
+ RGBA8 filled(0, 255, 0, 255);
+
+ dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
+ queue.Submit(1, &commands);
+
+ EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
+ renderPass.color.Destroy();
+}
+
+// First submit succeeds, draws triangle, second submit fails
+// after destroy is called on the texture
+TEST_P(DestroyTest, TextureSubmitDestroySubmit) {
+ RGBA8 filled(0, 255, 0, 255);
+
+ dawn::CommandBuffer commands = CreateTriangleCommandBuffer();
+ queue.Submit(1, &commands);
+ EXPECT_PIXEL_RGBA8_EQ(filled, renderPass.color, 1, 3);
+
+ renderPass.color.Destroy();
+
+ // Submit fails because texture was destroyed
+ ASSERT_DEVICE_ERROR(queue.Submit(1, &commands));
+}
+
+DAWN_INSTANTIATE_TEST(DestroyTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend);
diff --git a/src/utils/ComboRenderPipelineDescriptor.h b/src/utils/ComboRenderPipelineDescriptor.h
index 8be63d2..9448705 100644
--- a/src/utils/ComboRenderPipelineDescriptor.h
+++ b/src/utils/ComboRenderPipelineDescriptor.h
@@ -1,52 +1,52 @@
-// Copyright 2018 The Dawn Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
-#define UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
-
-#include <dawn/dawncpp.h>
-
-#include "common/Constants.h"
-
-#include <array>
-
-namespace utils {
-
- class ComboVertexInputDescriptor : public dawn::VertexInputDescriptor {
- public:
- ComboVertexInputDescriptor();
-
- std::array<dawn::VertexBufferDescriptor, kMaxVertexBuffers> cBuffers;
- std::array<dawn::VertexAttributeDescriptor, kMaxVertexAttributes> cAttributes;
- };
-
- class ComboRenderPipelineDescriptor : public dawn::RenderPipelineDescriptor {
- public:
- ComboRenderPipelineDescriptor(const dawn::Device& device);
-
- dawn::PipelineStageDescriptor cVertexStage;
- dawn::PipelineStageDescriptor cFragmentStage;
-
- ComboVertexInputDescriptor cVertexInput;
- dawn::RasterizationStateDescriptor cRasterizationState;
- std::array<dawn::ColorStateDescriptor*, kMaxColorAttachments> cColorStates;
- dawn::DepthStencilStateDescriptor cDepthStencilState;
-
- private:
- dawn::ColorStateDescriptor mColorStates[kMaxColorAttachments];
- };
-
-} // namespace utils
-
-#endif // UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
+// Copyright 2018 The Dawn Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
+#define UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
+
+#include <dawn/dawncpp.h>
+
+#include "common/Constants.h"
+
+#include <array>
+
+namespace utils {
+
+ class ComboVertexInputDescriptor : public dawn::VertexInputDescriptor {
+ public:
+ ComboVertexInputDescriptor();
+
+ std::array<dawn::VertexBufferDescriptor, kMaxVertexBuffers> cBuffers;
+ std::array<dawn::VertexAttributeDescriptor, kMaxVertexAttributes> cAttributes;
+ };
+
+ class ComboRenderPipelineDescriptor : public dawn::RenderPipelineDescriptor {
+ public:
+ ComboRenderPipelineDescriptor(const dawn::Device& device);
+
+ dawn::PipelineStageDescriptor cVertexStage;
+ dawn::PipelineStageDescriptor cFragmentStage;
+
+ ComboVertexInputDescriptor cVertexInput;
+ dawn::RasterizationStateDescriptor cRasterizationState;
+ std::array<dawn::ColorStateDescriptor*, kMaxColorAttachments> cColorStates;
+ dawn::DepthStencilStateDescriptor cDepthStencilState;
+
+ private:
+ dawn::ColorStateDescriptor mColorStates[kMaxColorAttachments];
+ };
+
+} // namespace utils
+
+#endif // UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
