Remove CubeReflection and the dependency on GLM

Bug: None
Change-Id: Ie0948a8c14751777754360d276ce212507b74642
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/72581
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

.gitignore

@@ -11,7 +11,6 @@
 /third_party/angle
 /third_party/clang-format
 /third_party/glfw
-/third_party/glm
 /third_party/googletest
 /third_party/gpuweb
 /third_party/jinja2

CMakeLists.txt

@@ -126,7 +126,6 @@ set(ABSL_PROPAGATE_CXX_STD ON)
 
 set_if_not_defined(DAWN_ABSEIL_DIR "${DAWN_THIRD_PARTY_DIR}/abseil-cpp" "Directory in which to find Abseil")
 set_if_not_defined(DAWN_GLFW_DIR "${DAWN_THIRD_PARTY_DIR}/glfw" "Directory in which to find GLFW")
-set_if_not_defined(DAWN_GLM_DIR "${DAWN_THIRD_PARTY_DIR}/glm" "Directory in which to find GLM")
 set_if_not_defined(DAWN_JINJA2_DIR "${DAWN_THIRD_PARTY_DIR}/jinja2" "Directory in which to find Jinja2")
 set_if_not_defined(DAWN_SPIRV_CROSS_DIR "${DAWN_THIRD_PARTY_DIR}/vulkan-deps/spirv-cross/src" "Directory in which to find SPIRV-Cross")
 set_if_not_defined(DAWN_SPIRV_HEADERS_DIR "${DAWN_THIRD_PARTY_DIR}/vulkan-deps/spirv-headers/src" "Directory in which to find SPIRV-Headers")

DEPS

@@ -110,12 +110,6 @@ deps = {
     'condition': 'dawn_standalone',
   },
 
-  # Dependencies for samples: GLM
-  'third_party/glm': {
-    'url': '{github_git}/g-truc/glm.git@bf71a834948186f4097caa076cd2663c69a10e1e',
-    'condition': 'dawn_standalone',
-  },
-
   'third_party/vulkan_memory_allocator': {
     'url': '{chromium_git}/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@1ecb35c39875c77219c75ecb5c5b3316020f66b8',
     'condition': 'dawn_standalone',

build_overrides/dawn.gni

@@ -31,7 +31,6 @@ dawn_abseil_dir = "//third_party/abseil-cpp"
 dawn_angle_dir = "//third_party/angle"
 dawn_jinja2_dir = "//third_party/jinja2"
 dawn_glfw_dir = "//third_party/glfw"
-dawn_glm_dir = "//third_party/glm"
 dawn_googletest_dir = "//third_party/googletest"
 dawn_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
 dawn_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"

examples/BUILD.gn

@@ -20,7 +20,6 @@ group("dawn_samples") {
     ":CHelloTriangle",
     ":ComputeBoids",
     ":CppHelloTriangle",
-    ":CubeReflection",
     ":ManualSwapChainTest",
   ]
 }
@@ -68,18 +67,12 @@ dawn_sample("CHelloTriangle") {
 
 dawn_sample("ComputeBoids") {
   sources = [ "ComputeBoids.cpp" ]
-  deps = [ "${dawn_root}/third_party/gn/glm" ]
 }
 
 dawn_sample("Animometer") {
   sources = [ "Animometer.cpp" ]
 }
 
-dawn_sample("CubeReflection") {
-  sources = [ "CubeReflection.cpp" ]
-  deps = [ "${dawn_root}/third_party/gn/glm" ]
-}
-
 dawn_sample("ManualSwapChainTest") {
   sources = [ "ManualSwapChainTest.cpp" ]
 }

examples/CMakeLists.txt

@@ -35,10 +35,7 @@ add_executable(CHelloTriangle "CHelloTriangle.cpp")
 target_link_libraries(CHelloTriangle dawn_sample_utils)
 
 add_executable(ComputeBoids "ComputeBoids.cpp")
-target_link_libraries(ComputeBoids dawn_sample_utils glm)
+target_link_libraries(ComputeBoids dawn_sample_utils)
 
 add_executable(Animometer "Animometer.cpp")
 target_link_libraries(Animometer dawn_sample_utils)
-
-add_executable(CubeReflection "CubeReflection.cpp")
-target_link_libraries(CubeReflection dawn_sample_utils glm)

examples/ComputeBoids.cpp

@@ -23,8 +23,6 @@
 #include <cstring>
 #include <random>
 
-#include <glm/glm.hpp>
-
 wgpu::Device device;
 wgpu::Queue queue;
 wgpu::SwapChain swapchain;
@@ -44,8 +42,8 @@ size_t pingpong = 0;
 static const uint32_t kNumParticles = 1000;
 
 struct Particle {
-    glm::vec2 pos;
+    std::array<float, 2> pos;
-    glm::vec2 vel;
+    std::array<float, 2> vel;
 };
 
 struct SimParams {
@@ -60,13 +58,13 @@ struct SimParams {
 };
 
 void initBuffers() {
-    glm::vec2 model[3] = {
+    std::array<std::array<float, 2>, 3> model = {{
         {-0.01, -0.02},
         {0.01, -0.02},
         {0.00, 0.02},
-    };
+    }};
     modelBuffer =
-        utils::CreateBufferFromData(device, model, sizeof(model), wgpu::BufferUsage::Vertex);
+        utils::CreateBufferFromData(device, &model, sizeof(model), wgpu::BufferUsage::Vertex);
 
     SimParams params = {0.04f, 0.1f, 0.025f, 0.025f, 0.02f, 0.05f, 0.005f, kNumParticles};
     updateParams =
@@ -77,8 +75,8 @@ void initBuffers() {
         std::mt19937 generator;
         std::uniform_real_distribution<float> dist(-1.0f, 1.0f);
         for (auto& p : initialParticles) {
-            p.pos = glm::vec2(dist(generator), dist(generator));
+            p.pos = {dist(generator), dist(generator)};
-            p.vel = glm::vec2(dist(generator), dist(generator)) * 0.1f;
+            p.vel = {dist(generator) * 0.1f, dist(generator) * 0.1f};
         }
     }
 
@@ -134,7 +132,7 @@ void initRender() {
     descriptor.cAttributes[1].shaderLocation = 1;
     descriptor.cAttributes[1].offset = offsetof(Particle, vel);
     descriptor.cAttributes[1].format = wgpu::VertexFormat::Float32x2;
-    descriptor.cBuffers[1].arrayStride = sizeof(glm::vec2);
+    descriptor.cBuffers[1].arrayStride = 2 * sizeof(float);
     descriptor.cBuffers[1].attributeCount = 1;
     descriptor.cBuffers[1].attributes = &descriptor.cAttributes[2];
     descriptor.cAttributes[2].shaderLocation = 2;

examples/CubeReflection.cpp

@@ -1,311 +0,0 @@
-// Copyright 2017 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 "SampleUtils.h"
-
-#include "utils/ComboRenderPipelineDescriptor.h"
-#include "utils/ScopedAutoreleasePool.h"
-#include "utils/SystemUtils.h"
-#include "utils/WGPUHelpers.h"
-
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-#include <vector>
-
-wgpu::Device device;
-
-wgpu::Buffer indexBuffer;
-wgpu::Buffer vertexBuffer;
-wgpu::Buffer planeBuffer;
-wgpu::Buffer cameraBuffer;
-wgpu::Buffer transformBuffer[2];
-
-wgpu::BindGroup cameraBindGroup;
-wgpu::BindGroup bindGroup[2];
-wgpu::BindGroup cubeTransformBindGroup[2];
-
-wgpu::Queue queue;
-wgpu::SwapChain swapchain;
-wgpu::TextureView depthStencilView;
-wgpu::RenderPipeline pipeline;
-wgpu::RenderPipeline planePipeline;
-wgpu::RenderPipeline reflectionPipeline;
-
-void initBuffers() {
-    static const uint32_t indexData[6 * 6] = {0,  1,  2,  0,  2,  3,
-
-                                              4,  5,  6,  4,  6,  7,
-
-                                              8,  9,  10, 8,  10, 11,
-
-                                              12, 13, 14, 12, 14, 15,
-
-                                              16, 17, 18, 16, 18, 19,
-
-                                              20, 21, 22, 20, 22, 23};
-    indexBuffer =
-        utils::CreateBufferFromData(device, indexData, sizeof(indexData), wgpu::BufferUsage::Index);
-
-    static const float vertexData[6 * 4 * 6] = {
-        -1.0, -1.0, 1.0,  1.0, 0.0, 0.0, 1.0,  -1.0, 1.0,  1.0, 0.0, 0.0,
-        1.0,  1.0,  1.0,  1.0, 0.0, 0.0, -1.0, 1.0,  1.0,  1.0, 0.0, 0.0,
-
-        -1.0, -1.0, -1.0, 1.0, 1.0, 0.0, -1.0, 1.0,  -1.0, 1.0, 1.0, 0.0,
-        1.0,  1.0,  -1.0, 1.0, 1.0, 0.0, 1.0,  -1.0, -1.0, 1.0, 1.0, 0.0,
-
-        -1.0, 1.0,  -1.0, 1.0, 0.0, 1.0, -1.0, 1.0,  1.0,  1.0, 0.0, 1.0,
-        1.0,  1.0,  1.0,  1.0, 0.0, 1.0, 1.0,  1.0,  -1.0, 1.0, 0.0, 1.0,
-
-        -1.0, -1.0, -1.0, 0.0, 1.0, 0.0, 1.0,  -1.0, -1.0, 0.0, 1.0, 0.0,
-        1.0,  -1.0, 1.0,  0.0, 1.0, 0.0, -1.0, -1.0, 1.0,  0.0, 1.0, 0.0,
-
-        1.0,  -1.0, -1.0, 0.0, 1.0, 1.0, 1.0,  1.0,  -1.0, 0.0, 1.0, 1.0,
-        1.0,  1.0,  1.0,  0.0, 1.0, 1.0, 1.0,  -1.0, 1.0,  0.0, 1.0, 1.0,
-
-        -1.0, -1.0, -1.0, 1.0, 1.0, 1.0, -1.0, -1.0, 1.0,  1.0, 1.0, 1.0,
-        -1.0, 1.0,  1.0,  1.0, 1.0, 1.0, -1.0, 1.0,  -1.0, 1.0, 1.0, 1.0};
-    vertexBuffer = utils::CreateBufferFromData(device, vertexData, sizeof(vertexData),
-                                               wgpu::BufferUsage::Vertex);
-
-    static const float planeData[6 * 4] = {
-        -2.0, -1.0, -2.0, 0.5, 0.5, 0.5, 2.0,  -1.0, -2.0, 0.5, 0.5, 0.5,
-        2.0,  -1.0, 2.0,  0.5, 0.5, 0.5, -2.0, -1.0, 2.0,  0.5, 0.5, 0.5,
-    };
-    planeBuffer = utils::CreateBufferFromData(device, planeData, sizeof(planeData),
-                                              wgpu::BufferUsage::Vertex);
-}
-
-struct CameraData {
-    glm::mat4 view;
-    glm::mat4 proj;
-} cameraData;
-
-void init() {
-    device = CreateCppDawnDevice();
-
-    queue = device.GetQueue();
-    swapchain = GetSwapChain(device);
-    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
-                        640, 480);
-
-    initBuffers();
-
-    wgpu::ShaderModule vsModule = utils::CreateShaderModule(device, R"(
-        [[block]] struct Camera {
-            view : mat4x4<f32>;
-            proj : mat4x4<f32>;
-        };
-        [[group(0), binding(0)]] var<uniform> camera : Camera;
-
-        [[block]] struct Model {
-            matrix : mat4x4<f32>;
-        };
-        [[group(0), binding(1)]] var<uniform> model : Model;
-
-        struct VertexOut {
-            [[location(2)]] f_col : vec3<f32>;
-            [[builtin(position)]] Position : vec4<f32>;
-        };
-
-        [[stage(vertex)]] fn main(
-            [[location(0)]] pos : vec3<f32>,
-            [[location(1)]] col : vec3<f32>) -> VertexOut {
-            var output : VertexOut;
-            output.f_col = col;
-            output.Position = camera.proj * camera.view * model.matrix * vec4<f32>(pos, 1.0);
-            return output;
-        })");
-
-    wgpu::ShaderModule fsModule = utils::CreateShaderModule(device, R"(
-        [[stage(fragment)]] fn main(
-            [[location(2)]] f_col : vec3<f32>) -> [[location(0)]] vec4<f32> {
-            return vec4<f32>(f_col, 1.0);
-        })");
-
-    wgpu::ShaderModule fsReflectionModule = utils::CreateShaderModule(device, R"(
-        [[stage(fragment)]] fn main(
-            [[location(2)]] f_col : vec3<f32>) -> [[location(0)]] vec4<f32> {
-            return vec4<f32>(mix(f_col, vec3<f32>(0.5, 0.5, 0.5), vec3<f32>(0.5, 0.5, 0.5)), 1.0);
-        })");
-
-    wgpu::VertexAttribute attributes[2];
-    attributes[0].shaderLocation = 0;
-    attributes[0].offset = 0;
-    attributes[0].format = wgpu::VertexFormat::Float32x3;
-    attributes[1].shaderLocation = 1;
-    attributes[1].offset = 3 * sizeof(float);
-    attributes[1].format = wgpu::VertexFormat::Float32x3;
-
-    wgpu::VertexBufferLayout vertexBufferLayout;
-    vertexBufferLayout.attributeCount = 2;
-    vertexBufferLayout.attributes = attributes;
-    vertexBufferLayout.arrayStride = 6 * sizeof(float);
-
-    auto bgl = utils::MakeBindGroupLayout(
-        device, {
-                    {0, wgpu::ShaderStage::Vertex, wgpu::BufferBindingType::Uniform},
-                    {1, wgpu::ShaderStage::Vertex, wgpu::BufferBindingType::Uniform},
-                });
-
-    wgpu::PipelineLayout pl = utils::MakeBasicPipelineLayout(device, &bgl);
-
-    wgpu::BufferDescriptor cameraBufDesc;
-    cameraBufDesc.size = sizeof(CameraData);
-    cameraBufDesc.usage = wgpu::BufferUsage::CopyDst | wgpu::BufferUsage::Uniform;
-    cameraBuffer = device.CreateBuffer(&cameraBufDesc);
-
-    glm::mat4 transform(1.0);
-    transformBuffer[0] = utils::CreateBufferFromData(device, &transform, sizeof(glm::mat4),
-                                                     wgpu::BufferUsage::Uniform);
-
-    transform = glm::translate(transform, glm::vec3(0.f, -2.f, 0.f));
-    transformBuffer[1] = utils::CreateBufferFromData(device, &transform, sizeof(glm::mat4),
-                                                     wgpu::BufferUsage::Uniform);
-
-    bindGroup[0] = utils::MakeBindGroup(
-        device, bgl,
-        {{0, cameraBuffer, 0, sizeof(CameraData)}, {1, transformBuffer[0], 0, sizeof(glm::mat4)}});
-
-    bindGroup[1] = utils::MakeBindGroup(
-        device, bgl,
-        {{0, cameraBuffer, 0, sizeof(CameraData)}, {1, transformBuffer[1], 0, sizeof(glm::mat4)}});
-
-    depthStencilView = CreateDefaultDepthStencilView(device);
-
-    {
-        utils::ComboRenderPipelineDescriptor descriptor;
-        descriptor.vertex.module = vsModule;
-        descriptor.vertex.bufferCount = 1;
-        descriptor.vertex.buffers = &vertexBufferLayout;
-
-        descriptor.layout = pl;
-        descriptor.cFragment.module = fsModule;
-        descriptor.cTargets[0].format = GetPreferredSwapChainTextureFormat();
-
-        wgpu::DepthStencilState* depthStencil =
-            descriptor.EnableDepthStencil(wgpu::TextureFormat::Depth24PlusStencil8);
-        depthStencil->depthWriteEnabled = true;
-        depthStencil->depthCompare = wgpu::CompareFunction::Less;
-
-        pipeline = device.CreateRenderPipeline(&descriptor);
-    }
-
-    {
-        utils::ComboRenderPipelineDescriptor descriptor;
-        descriptor.vertex.module = vsModule;
-        descriptor.vertex.bufferCount = 1;
-        descriptor.vertex.buffers = &vertexBufferLayout;
-
-        descriptor.layout = pl;
-        descriptor.cFragment.module = fsModule;
-        descriptor.cTargets[0].format = GetPreferredSwapChainTextureFormat();
-
-        wgpu::DepthStencilState* depthStencil =
-            descriptor.EnableDepthStencil(wgpu::TextureFormat::Depth24PlusStencil8);
-        depthStencil->stencilFront.passOp = wgpu::StencilOperation::Replace;
-        depthStencil->stencilBack.passOp = wgpu::StencilOperation::Replace;
-        depthStencil->depthCompare = wgpu::CompareFunction::Less;
-
-        planePipeline = device.CreateRenderPipeline(&descriptor);
-    }
-
-    {
-        utils::ComboRenderPipelineDescriptor descriptor;
-        descriptor.vertex.module = vsModule;
-        descriptor.vertex.bufferCount = 1;
-        descriptor.vertex.buffers = &vertexBufferLayout;
-
-        descriptor.layout = pl;
-        descriptor.cFragment.module = fsReflectionModule;
-        descriptor.cTargets[0].format = GetPreferredSwapChainTextureFormat();
-
-        wgpu::DepthStencilState* depthStencil =
-            descriptor.EnableDepthStencil(wgpu::TextureFormat::Depth24PlusStencil8);
-        depthStencil->stencilFront.compare = wgpu::CompareFunction::Equal;
-        depthStencil->stencilBack.compare = wgpu::CompareFunction::Equal;
-        depthStencil->stencilFront.passOp = wgpu::StencilOperation::Replace;
-        depthStencil->stencilBack.passOp = wgpu::StencilOperation::Replace;
-        depthStencil->depthWriteEnabled = true;
-        depthStencil->depthCompare = wgpu::CompareFunction::Less;
-
-        reflectionPipeline = device.CreateRenderPipeline(&descriptor);
-    }
-
-    cameraData.proj = glm::perspective(glm::radians(45.0f), 1.f, 1.0f, 100.0f);
-}
-
-struct {
-    uint32_t a;
-    float b;
-} s;
-void frame() {
-    s.a = (s.a + 1) % 256;
-    s.b += 0.01f;
-    if (s.b >= 1.0f) {
-        s.b = 0.0f;
-    }
-
-    cameraData.view = glm::lookAt(glm::vec3(8.f * std::sin(glm::radians(s.b * 360.f)), 2.f,
-                                            8.f * std::cos(glm::radians(s.b * 360.f))),
-                                  glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
-
-    queue.WriteBuffer(cameraBuffer, 0, &cameraData, sizeof(CameraData));
-
-    wgpu::TextureView backbufferView = swapchain.GetCurrentTextureView();
-    utils::ComboRenderPassDescriptor renderPass({backbufferView}, depthStencilView);
-
-    wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
-    {
-        wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass);
-        pass.SetPipeline(pipeline);
-        pass.SetBindGroup(0, bindGroup[0]);
-        pass.SetVertexBuffer(0, vertexBuffer);
-        pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint32);
-        pass.DrawIndexed(36);
-
-        pass.SetStencilReference(0x1);
-        pass.SetPipeline(planePipeline);
-        pass.SetBindGroup(0, bindGroup[0]);
-        pass.SetVertexBuffer(0, planeBuffer);
-        pass.DrawIndexed(6);
-
-        pass.SetPipeline(reflectionPipeline);
-        pass.SetVertexBuffer(0, vertexBuffer);
-        pass.SetBindGroup(0, bindGroup[1]);
-        pass.DrawIndexed(36);
-
-        pass.EndPass();
-    }
-
-    wgpu::CommandBuffer commands = encoder.Finish();
-    queue.Submit(1, &commands);
-    swapchain.Present();
-    DoFlush();
-}
-
-int main(int argc, const char* argv[]) {
-    if (!InitSample(argc, argv)) {
-        return 1;
-    }
-    init();
-
-    while (!ShouldQuit()) {
-        utils::ScopedAutoreleasePool pool;
-        frame();
-        utils::USleep(16000);
-    }
-
-    // TODO release stuff
-}

scripts/dawn_overrides_with_defaults.gni

@@ -41,10 +41,6 @@ if (!defined(dawn_glfw_dir)) {
   dawn_glfw_dir = "//third_party/glfw"
 }
 
-if (!defined(dawn_glm_dir)) {
-  dawn_glm_dir = "//third_party/glm"
-}
-
 if (!defined(dawn_googletest_dir)) {
   dawn_googletest_dir = "//third_party/googletest"
 }

third_party/CMakeLists.txt

@@ -50,13 +50,6 @@ if (NOT TARGET glfw)
     add_subdirectory(${DAWN_GLFW_DIR} "${CMAKE_CURRENT_BINARY_DIR}/glfw")
 endif()
 
-if (DAWN_BUILD_EXAMPLES)
-    if (NOT TARGET glm)
-        message(STATUS "Dawn: using GLM at ${DAWN_GLM_DIR}")
-        add_subdirectory(${DAWN_GLM_DIR} "${CMAKE_CURRENT_BINARY_DIR}/glm")
-    endif()
-endif()
-
 if (NOT TARGET libtint)
     message(STATUS "Dawn: using Tint at ${DAWN_TINT_DIR}")
     # TODO(crbug.com/tint/1217): Tint expects glslang for validation when

third_party/gn/glm/BUILD.gn

@@ -1,38 +0,0 @@
-# Copyright 2020 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.
-
-import("../../../scripts/dawn_overrides_with_defaults.gni")
-
-assert(dawn_standalone)
-
-config("glm_public_config") {
-  include_dirs = [ "${dawn_glm_dir}" ]
-
-  # GLM tries to suppress the warning for clang but gets confused by clang-cl
-  # and thinks it is MSVC.
-  if (is_win && is_clang) {
-    cflags = [
-      "-Wno-gnu-anonymous-struct",
-      "-Wno-nested-anon-types",
-    ]
-  }
-}
-source_set("glm") {
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
-
-  public_configs = [ ":glm_public_config" ]
-
-  # GLM is header only but has too many files to list them for "gn check"
-}