msvc doesn't like VLA arg syntax

gfx-rs · Oct 4, 2023 · ffc7c21 · ffc7c21
1 parent b101dbc
commit ffc7c21
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/examples/framework/framework.c b/examples/framework/framework.c
@@ -88,7 +88,8 @@ WGPUShaderModule frmwrk_load_shader_module(WGPUDevice device,
 #define MAX(A, B) ((A) > (B) ? (A) : (B))
 
 WGPUBuffer frmwrk_device_create_buffer_init(
-    WGPUDevice device, frmwrk_buffer_init_descriptor descriptor[static 1]) {
+    WGPUDevice device, const frmwrk_buffer_init_descriptor *descriptor) {
+  assert(descriptor);
   if (descriptor->content_size == 0) {
     return wgpuDeviceCreateBuffer(device, &(WGPUBufferDescriptor){
                                               .label = descriptor->label,

diff --git a/examples/framework/framework.h b/examples/framework/framework.h
@@ -21,6 +21,6 @@ void frmwrk_setup_logging(WGPULogLevel level);
 WGPUShaderModule frmwrk_load_shader_module(WGPUDevice device, const char *name);
 void frmwrk_print_global_report(WGPUGlobalReport report);
 WGPUBuffer frmwrk_device_create_buffer_init(
-    WGPUDevice device, frmwrk_buffer_init_descriptor descriptor[static 1]);
+    WGPUDevice device, const frmwrk_buffer_init_descriptor *descriptor);
 
 #endif // FRAMEWORK_H
diff --git a/examples/texture_arrays/main.c b/examples/texture_arrays/main.c
@@ -274,7 +274,7 @@ int main(int argc, char *argv[]) {
 
   wgpuAdapterRequestDevice(
       demo.adapter,
-      &(WGPUDeviceDescriptor){
+      &(const WGPUDeviceDescriptor){
           .requiredFeatureCount = required_device_feature_count,
           .requiredFeatures = required_device_features,
       },
@@ -327,7 +327,7 @@ int main(int argc, char *argv[]) {
   printf("Using fragment entry point: '%s'\n", fragment_entry_point);
 
   WGPUBuffer vertex_buffer = frmwrk_device_create_buffer_init(
-      demo.device, &(frmwrk_buffer_init_descriptor){
+      demo.device, &(const frmwrk_buffer_init_descriptor){
                        .label = "Vertex Buffer",
                        .content = (void *)vertices,
                        .content_size = sizeof(vertices),
@@ -336,7 +336,7 @@ int main(int argc, char *argv[]) {
   assert(vertex_buffer);
 
   WGPUBuffer index_buffer = frmwrk_device_create_buffer_init(
-      demo.device, &(frmwrk_buffer_init_descriptor){
+      demo.device, &(const frmwrk_buffer_init_descriptor){
                        .label = "Index Buffer",
                        .content = (void *)indices,
                        .content_size = sizeof(indices),
@@ -349,7 +349,7 @@ int main(int argc, char *argv[]) {
       [64] = 1,
   };
   WGPUBuffer texture_index_buffer = frmwrk_device_create_buffer_init(
-      demo.device, &(frmwrk_buffer_init_descriptor){
+      demo.device, &(const frmwrk_buffer_init_descriptor){
                        .label = "Texture Index Buffer",
                        .content = texture_index_buffer_contents,
                        .content_size = sizeof(texture_index_buffer_contents),
@@ -374,25 +374,25 @@ int main(int argc, char *argv[]) {
   /* clang-format on */
 
   WGPUTexture red_texture = wgpuDeviceCreateTexture(
-      demo.device, &(WGPUTextureDescriptor){
+      demo.device, &(const WGPUTextureDescriptor){
                        COLOR_TEXTURE_DESCRIPTOR_COMMON_FIELDS,
                        .label = "red",
                    });
   assert(red_texture);
   WGPUTexture green_texture = wgpuDeviceCreateTexture(
-      demo.device, &(WGPUTextureDescriptor){
+      demo.device, &(const WGPUTextureDescriptor){
                        COLOR_TEXTURE_DESCRIPTOR_COMMON_FIELDS,
                        .label = "green",
                    });
   assert(green_texture);
   WGPUTexture blue_texture = wgpuDeviceCreateTexture(
-      demo.device, &(WGPUTextureDescriptor){
+      demo.device, &(const WGPUTextureDescriptor){
                        COLOR_TEXTURE_DESCRIPTOR_COMMON_FIELDS,
                        .label = "blue",
                    });
   assert(blue_texture);
   WGPUTexture white_texture = wgpuDeviceCreateTexture(
-      demo.device, &(WGPUTextureDescriptor){
+      demo.device, &(const WGPUTextureDescriptor){
                        COLOR_TEXTURE_DESCRIPTOR_COMMON_FIELDS,
                        .label = "white",
                    });