Improve GpuBuffer constructor consistency

Nelarius · Nov 1, 2023 · 0a826c4 · 0a826c4
1 parent a96266e
commit 0a826c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/gpu_buffer.cpp b/src/gpu_buffer.cpp
@@ -67,10 +67,10 @@ GpuBuffer& GpuBuffer::operator=(GpuBuffer&& other)
 }
 
 GpuBuffer::GpuBuffer(
-    WGPUDevice           device,
-    const char*          label,
-    std::size_t          byteSize,
-    WGPUBufferUsageFlags usage)
+    const WGPUDevice           device,
+    const char* const          label,
+    const WGPUBufferUsageFlags usage,
+    const std::size_t          byteSize)
     : mBuffer(nullptr),
       mByteSize(byteSize),
       mUsage(usage)

diff --git a/src/gpu_buffer.hpp b/src/gpu_buffer.hpp
@@ -27,8 +27,8 @@ class GpuBuffer
     GpuBuffer(
         WGPUDevice           device,
         const char*          label,
-        std::size_t          byteSize,
-        WGPUBufferUsageFlags usage);
+        WGPUBufferUsageFlags usage,
+        std::size_t          byteSize);
 
     template<typename T>
     GpuBuffer(

diff --git a/src/renderer.cpp b/src/renderer.cpp
@@ -57,18 +57,18 @@ Renderer::Renderer(const RendererDescriptor& rendererDesc, const GpuContext& gpu
     : frameDataBuffer(
           gpuContext.device,
           "frame data buffer",
-          sizeof(FrameDataBuffer),
-          WGPUBufferUsage_CopyDst | WGPUBufferUsage_Uniform),
+          WGPUBufferUsage_CopyDst | WGPUBufferUsage_Uniform,
+          sizeof(FrameDataBuffer)),
       pixelBuffer(
           gpuContext.device,
           "pixel buffer",
+          WGPUBufferUsage_CopyDst | WGPUBufferUsage_Storage,
           [&rendererDesc]() -> std::size_t {
               const Extent2i    largestResolution = rendererDesc.maxFramebufferSize;
               const std::size_t numPixels =
                   static_cast<std::size_t>(largestResolution.x * largestResolution.y);
               return sizeof(glm::vec3) * numPixels;
-          }(),
-          WGPUBufferUsage_CopyDst | WGPUBufferUsage_Storage),
+          }()),
       computePixelsBindGroup(nullptr),
       computePipeline(nullptr),
       vertexBuffer(),