encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-14 07:36:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove CubeReflection and the dependency on GLM

Browse Source 
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>
This commit is contained in:
Corentin Wallez
2021-12-14 08:42:36 +00:00
committed by Dawn LUCI CQ
parent 4682ae0034
commit 5bd9445127
11 changed files with 9 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/ComputeBoids.cpp
View File

@@ -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;
glm::vec2 vel;
std::array<float, 2> pos;
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.vel = glm::vec2(dist(generator), dist(generator)) * 0.1f;
p.pos = {dist(generator), dist(generator)};
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;