wgpu samples: start fixing triangle sample

floooh · Aug 2, 2023 · 5599ddc · 5599ddc
1 parent 82fc0ad
commit 5599ddc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/wgpu/CMakeLists.txt b/wgpu/CMakeLists.txt
@@ -11,12 +11,12 @@ fips_begin_app(clear-wgpu windowed)
     fips_deps(wgpu_entry)
 fips_end_app()
 
-#fips_begin_app(triangle-wgpu windowed)
-#    fips_files(triangle-wgpu.c)
-#    sokol_shader(triangle-wgpu.glsl wgpu)
-#    fips_deps(wgpu_entry)
-#fips_end_app()
-#
+fips_begin_app(triangle-wgpu windowed)
+    fips_files(triangle-wgpu.c)
+    sokol_shader(triangle-wgpu.glsl wgsl)
+    fips_deps(wgpu_entry)
+fips_end_app()
+
 #fips_begin_app(quad-wgpu windowed)
 #    fips_files(quad-wgpu.c)
 #    sokol_shader(quad-wgpu.glsl wgpu)

diff --git a/wgpu/triangle-wgpu.c b/wgpu/triangle-wgpu.c
@@ -2,11 +2,11 @@
 //  triangle-wgpu.c
 //  Vertex buffer, simple shader, pipeline state object.
 //------------------------------------------------------------------------------
+#include "wgpu_entry.h"
 #define SOKOL_IMPL
 #define SOKOL_WGPU
 #include "sokol_gfx.h"
 #include "sokol_log.h"
-#include "wgpu_entry.h"
 #include "triangle-wgpu.glsl.h"
 
 static struct {
@@ -15,7 +15,7 @@ static struct {
     sg_pass_action pass_action;
 } state = {
     .pass_action = {
-        .colors[0] = { .action = SG_ACTION_CLEAR, .value = { 0.0f, 0.0f, 0.0f, 1.0f } }
+        .colors[0] = { .load_action = SG_LOADACTION_CLEAR, .clear_value = { 0.0f, 0.0f, 0.0f, 1.0f } }
     }
 };
 
@@ -25,7 +25,7 @@ static void init(void) {
         .logger.func = slog_func,
     });
 
-    /* a vertex buffer with 3 vertices */
+    // a vertex buffer with 3 vertices
     float vertices[] = {
         // positions            // colors
          0.0f,  0.5f, 0.5f,     1.0f, 0.0f, 0.0f, 1.0f,
@@ -36,10 +36,10 @@ static void init(void) {
         .data = SG_RANGE(vertices)
     });
 
-    /* create a shader from precompiled SPIRV bytecode */
+    // FIXME: use WGSL directly here, not sokol-shdc
     sg_shader shd = sg_make_shader(triangle_shader_desc(sg_query_backend()));
 
-    /* create a pipeline object (default render states are fine for triangle) */
+    // create a pipeline object (default render states are fine for triangle)
     state.pip = sg_make_pipeline(&(sg_pipeline_desc){
         .shader = shd,
         .layout = {