feat: update sokol to latest

zeromake · Apr 26, 2024 · c2baa77 · c2baa77
1 parent bfbd48b
commit c2baa77
Show file tree

Hide file tree

Showing 185 changed files with 229 additions and 188 deletions.
diff --git a/README.md b/README.md
@@ -45,3 +45,8 @@ To enable web builds you need to setup the [emscripten](https://emscripten.org/i
 > # generate to docs dir
 ```
 
+#### Todo
+
+- [ ] [4-5-4-sharpen](src/4-5-framebuffers/4-sharpen.c)
+- [ ] [4-5-5-blur](src/4-5-framebuffers/5-blur.c)
+- [ ] [4-10-1-instancing](src/4-10-instancing/1-instancing.c)
diff --git a/docs/1-3-1.js b/docs/1-3-1.js
diff --git a/docs/1-3-1.wasm b/docs/1-3-1.wasm
diff --git a/docs/1-4-1.js b/docs/1-4-1.js
diff --git a/docs/1-4-1.wasm b/docs/1-4-1.wasm
diff --git a/docs/1-4-2.js b/docs/1-4-2.js
diff --git a/docs/1-4-2.wasm b/docs/1-4-2.wasm
diff --git a/docs/1-4-3.js b/docs/1-4-3.js
diff --git a/docs/1-4-3.wasm b/docs/1-4-3.wasm
diff --git a/docs/1-5-1.js b/docs/1-5-1.js
diff --git a/docs/1-5-1.wasm b/docs/1-5-1.wasm
diff --git a/docs/1-5-2.js b/docs/1-5-2.js
diff --git a/docs/1-5-2.wasm b/docs/1-5-2.wasm
diff --git a/docs/1-5-3.js b/docs/1-5-3.js
diff --git a/docs/1-5-3.wasm b/docs/1-5-3.wasm
diff --git a/docs/1-6-1.js b/docs/1-6-1.js
diff --git a/docs/1-6-1.wasm b/docs/1-6-1.wasm
diff --git a/docs/1-6-2.js b/docs/1-6-2.js
diff --git a/docs/1-6-2.wasm b/docs/1-6-2.wasm
diff --git a/docs/1-6-3.js b/docs/1-6-3.js
diff --git a/docs/1-6-3.wasm b/docs/1-6-3.wasm
diff --git a/docs/1-7-1.js b/docs/1-7-1.js
diff --git a/docs/1-7-1.wasm b/docs/1-7-1.wasm
diff --git a/docs/1-7-2.js b/docs/1-7-2.js
diff --git a/docs/1-7-2.wasm b/docs/1-7-2.wasm
diff --git a/docs/1-8-1.js b/docs/1-8-1.js
diff --git a/docs/1-8-1.wasm b/docs/1-8-1.wasm
diff --git a/docs/1-8-2.js b/docs/1-8-2.js
diff --git a/docs/1-8-2.wasm b/docs/1-8-2.wasm
diff --git a/docs/1-8-3.js b/docs/1-8-3.js
diff --git a/docs/1-8-3.wasm b/docs/1-8-3.wasm
diff --git a/docs/1-9-1.js b/docs/1-9-1.js
diff --git a/docs/1-9-1.wasm b/docs/1-9-1.wasm
diff --git a/docs/1-9-2.js b/docs/1-9-2.js
diff --git a/docs/1-9-2.wasm b/docs/1-9-2.wasm
diff --git a/docs/1-9-3.js b/docs/1-9-3.js
diff --git a/docs/1-9-3.wasm b/docs/1-9-3.wasm
diff --git a/docs/2-1-1.js b/docs/2-1-1.js
diff --git a/docs/2-1-1.wasm b/docs/2-1-1.wasm
diff --git a/docs/2-2-1.js b/docs/2-2-1.js
diff --git a/docs/2-2-1.wasm b/docs/2-2-1.wasm
diff --git a/docs/2-2-2.js b/docs/2-2-2.js
diff --git a/docs/2-2-2.wasm b/docs/2-2-2.wasm
diff --git a/docs/2-2-3.js b/docs/2-2-3.js
diff --git a/docs/2-2-3.wasm b/docs/2-2-3.wasm
diff --git a/docs/2-3-1.js b/docs/2-3-1.js
diff --git a/docs/2-3-1.wasm b/docs/2-3-1.wasm
diff --git a/docs/2-3-2.js b/docs/2-3-2.js
diff --git a/docs/2-3-2.wasm b/docs/2-3-2.wasm
diff --git a/docs/2-3-3.js b/docs/2-3-3.js
diff --git a/docs/2-3-3.wasm b/docs/2-3-3.wasm
diff --git a/docs/2-4-1.js b/docs/2-4-1.js
diff --git a/docs/2-4-1.wasm b/docs/2-4-1.wasm
diff --git a/docs/2-4-2.js b/docs/2-4-2.js
diff --git a/docs/2-4-2.wasm b/docs/2-4-2.wasm
diff --git a/docs/2-5-1.js b/docs/2-5-1.js
diff --git a/docs/2-5-1.wasm b/docs/2-5-1.wasm
diff --git a/docs/2-5-2.js b/docs/2-5-2.js
diff --git a/docs/2-5-2.wasm b/docs/2-5-2.wasm
diff --git a/docs/2-5-3.js b/docs/2-5-3.js
diff --git a/docs/2-5-3.wasm b/docs/2-5-3.wasm
diff --git a/docs/2-5-4.js b/docs/2-5-4.js
diff --git a/docs/2-5-4.wasm b/docs/2-5-4.wasm
diff --git a/docs/2-6-1.js b/docs/2-6-1.js
diff --git a/docs/2-6-1.wasm b/docs/2-6-1.wasm
diff --git a/docs/3-1-1.js b/docs/3-1-1.js
diff --git a/docs/3-1-1.wasm b/docs/3-1-1.wasm
diff --git a/docs/3-1-2.js b/docs/3-1-2.js
diff --git a/docs/3-1-2.wasm b/docs/3-1-2.wasm
diff --git a/docs/4-1-1.js b/docs/4-1-1.js
diff --git a/docs/4-1-1.wasm b/docs/4-1-1.wasm
diff --git a/docs/4-1-2.js b/docs/4-1-2.js
diff --git a/docs/4-1-2.wasm b/docs/4-1-2.wasm
diff --git a/docs/4-1-3.js b/docs/4-1-3.js
diff --git a/docs/4-1-3.wasm b/docs/4-1-3.wasm
diff --git a/docs/4-1-4.js b/docs/4-1-4.js
diff --git a/docs/4-1-4.wasm b/docs/4-1-4.wasm
diff --git a/docs/4-10-1.js b/docs/4-10-1.js
diff --git a/docs/4-10-1.wasm b/docs/4-10-1.wasm
diff --git a/docs/4-10-2.js b/docs/4-10-2.js
diff --git a/docs/4-10-2.wasm b/docs/4-10-2.wasm
diff --git a/docs/4-10-3.js b/docs/4-10-3.js
diff --git a/docs/4-10-3.wasm b/docs/4-10-3.wasm
diff --git a/docs/4-10-4.js b/docs/4-10-4.js
diff --git a/docs/4-10-4.wasm b/docs/4-10-4.wasm
diff --git a/docs/4-11-1.js b/docs/4-11-1.js
diff --git a/docs/4-11-1.wasm b/docs/4-11-1.wasm
diff --git a/docs/4-11-2.js b/docs/4-11-2.js
diff --git a/docs/4-11-2.wasm b/docs/4-11-2.wasm
diff --git a/docs/4-11-3.js b/docs/4-11-3.js
diff --git a/docs/4-11-3.wasm b/docs/4-11-3.wasm
diff --git a/docs/4-11-4.js b/docs/4-11-4.js
diff --git a/docs/4-11-4.wasm b/docs/4-11-4.wasm
diff --git a/docs/4-2-1.js b/docs/4-2-1.js
diff --git a/docs/4-2-1.wasm b/docs/4-2-1.wasm
diff --git a/docs/4-3-1.js b/docs/4-3-1.js
diff --git a/docs/4-3-1.wasm b/docs/4-3-1.wasm
diff --git a/docs/4-3-2.js b/docs/4-3-2.js
diff --git a/docs/4-3-2.wasm b/docs/4-3-2.wasm
diff --git a/docs/4-3-3.js b/docs/4-3-3.js
diff --git a/docs/4-3-3.wasm b/docs/4-3-3.wasm
diff --git a/docs/4-3-4.js b/docs/4-3-4.js
diff --git a/docs/4-3-4.wasm b/docs/4-3-4.wasm
diff --git a/docs/4-4-1.js b/docs/4-4-1.js
diff --git a/docs/4-4-1.wasm b/docs/4-4-1.wasm
diff --git a/docs/4-5-1.js b/docs/4-5-1.js
diff --git a/docs/4-5-1.wasm b/docs/4-5-1.wasm
diff --git a/docs/4-5-2.js b/docs/4-5-2.js
diff --git a/docs/4-5-2.wasm b/docs/4-5-2.wasm
diff --git a/docs/4-5-3.js b/docs/4-5-3.js
diff --git a/docs/4-5-3.wasm b/docs/4-5-3.wasm
diff --git a/docs/4-5-4.js b/docs/4-5-4.js
diff --git a/docs/4-5-4.wasm b/docs/4-5-4.wasm
diff --git a/docs/4-5-5.js b/docs/4-5-5.js
diff --git a/docs/4-5-5.wasm b/docs/4-5-5.wasm
diff --git a/docs/4-5-6.js b/docs/4-5-6.js
diff --git a/docs/4-5-6.wasm b/docs/4-5-6.wasm
diff --git a/docs/4-6-1.js b/docs/4-6-1.js
diff --git a/docs/4-6-1.wasm b/docs/4-6-1.wasm
diff --git a/docs/4-6-2.js b/docs/4-6-2.js
diff --git a/docs/4-6-2.wasm b/docs/4-6-2.wasm
diff --git a/docs/4-6-3.js b/docs/4-6-3.js
diff --git a/docs/4-6-3.wasm b/docs/4-6-3.wasm
diff --git a/docs/4-6-4.js b/docs/4-6-4.js
diff --git a/docs/4-6-4.wasm b/docs/4-6-4.wasm
diff --git a/docs/4-6-5.js b/docs/4-6-5.js
diff --git a/docs/4-6-5.wasm b/docs/4-6-5.wasm
diff --git a/docs/4-8-1.js b/docs/4-8-1.js
diff --git a/docs/4-8-1.wasm b/docs/4-8-1.wasm
diff --git a/docs/4-8-2.js b/docs/4-8-2.js
diff --git a/docs/4-8-2.wasm b/docs/4-8-2.wasm
diff --git a/docs/4-8-3.js b/docs/4-8-3.js
diff --git a/docs/4-8-3.wasm b/docs/4-8-3.wasm
diff --git a/docs/4-8-4.js b/docs/4-8-4.js
diff --git a/docs/4-8-4.wasm b/docs/4-8-4.wasm
diff --git a/docs/4-9-1.js b/docs/4-9-1.js
diff --git a/docs/4-9-1.wasm b/docs/4-9-1.wasm
diff --git a/docs/4-9-2.js b/docs/4-9-2.js
diff --git a/docs/4-9-2.wasm b/docs/4-9-2.wasm
diff --git a/docs/4-9-3.js b/docs/4-9-3.js
diff --git a/docs/4-9-3.wasm b/docs/4-9-3.wasm
diff --git a/docs/4-9-4.js b/docs/4-9-4.js
diff --git a/docs/4-9-4.wasm b/docs/4-9-4.wasm
diff --git a/docs/5-1-1.js b/docs/5-1-1.js
diff --git a/docs/5-1-1.wasm b/docs/5-1-1.wasm
diff --git a/docs/5-2-1.js b/docs/5-2-1.js
diff --git a/docs/5-2-1.wasm b/docs/5-2-1.wasm
diff --git a/docs/5-3-1.js b/docs/5-3-1.js
diff --git a/docs/5-3-1.wasm b/docs/5-3-1.wasm
diff --git a/docs/5-3-2.js b/docs/5-3-2.js
diff --git a/docs/5-3-2.wasm b/docs/5-3-2.wasm
diff --git a/docs/5-3-3.js b/docs/5-3-3.js
diff --git a/docs/5-3-3.wasm b/docs/5-3-3.wasm
diff --git a/docs/5-4-1.js b/docs/5-4-1.js
diff --git a/docs/5-4-1.wasm b/docs/5-4-1.wasm
diff --git a/docs/5-4-2.js b/docs/5-4-2.js
diff --git a/docs/5-4-2.wasm b/docs/5-4-2.wasm
diff --git a/docs/5-4-3.js b/docs/5-4-3.js
diff --git a/docs/5-4-3.wasm b/docs/5-4-3.wasm
diff --git a/docs/5-5-1.js b/docs/5-5-1.js
diff --git a/docs/5-5-1.wasm b/docs/5-5-1.wasm
diff --git a/docs/5-5-2.js b/docs/5-5-2.js
diff --git a/docs/5-5-2.wasm b/docs/5-5-2.wasm
diff --git a/docs/5-5-3.js b/docs/5-5-3.js
diff --git a/docs/5-5-3.wasm b/docs/5-5-3.wasm
diff --git a/docs/index.html b/docs/index.html
@@ -388,7 +388,7 @@ <h1><a class="main-menu-link" href="https://github.com/zeromake/learnopengl-exam
             <li> written in C, compiled to WebAssembly </li>
             <li> shader dialect GLSL v450, cross-compiled to GLSL v300es (WebGL2) </li>
             <li> uses <a href="https://github.com/floooh/sokol">Sokol libraries</a> for cross platform support </li>
-            <li> last updated: 2024-01-03 06:55:02 +00:00 </i>
+            <li> last updated: 2024-04-26 12:50:30 +00:00 </i>
         </ul>
     </section>
 

diff --git a/src/4-11-anti-aliasing/2-offscreen-msaa.c b/src/4-11-anti-aliasing/2-offscreen-msaa.c
@@ -14,8 +14,8 @@
 /* application state */
 static struct {
     struct {
-        sg_attachments pass;
-        sg_attachments_desc pass_desc;
+        sg_attachments attachment;
+        sg_attachments_desc attachment_desc;
         sg_pass_action pass_action;
         sg_pipeline pip;
         sg_bindings bind;
@@ -30,9 +30,9 @@ static struct {
 /* called initially and when window size changes */
 void create_offscreen_pass(int width, int height) {
     /* destroy previous resource (can be called for invalid id) */
-    sg_destroy_attachments(state.offscreen.pass);
-    sg_destroy_image(state.offscreen.pass_desc.colors[0].image);
-    sg_destroy_image(state.offscreen.pass_desc.depth_stencil.image);
+    sg_destroy_attachments(state.offscreen.attachment);
+    sg_destroy_image(state.offscreen.attachment_desc.colors[0].image);
+    sg_destroy_image(state.offscreen.attachment_desc.depth_stencil.image);
 
     /* create offscreen rendertarget images and pass */
     sg_sampler_desc color_smp_desc = {
@@ -60,12 +60,12 @@ void create_offscreen_pass(int width, int height) {
     depth_img_desc.type = SG_IMAGETYPE_2D;
     sg_image depth_img = sg_make_image(&depth_img_desc);
 
-    state.offscreen.pass_desc = (sg_attachments_desc){
+    state.offscreen.attachment_desc = (sg_attachments_desc){
         .colors[0].image = color_img,
         .depth_stencil.image = depth_img,
         .label = "offscreen-pass"
     };
-    state.offscreen.pass = sg_make_attachments(&state.offscreen.pass_desc);
+    state.offscreen.attachment = sg_make_attachments(&state.offscreen.attachment_desc);
 
     /* also need to update the fullscreen-quad texture bindings */
     state.display.bind.fs.images[SLOT__diffuse_texture] = color_img;
@@ -210,7 +210,7 @@ void frame(void) {
     };
 
     /* the offscreen pass, rendering an rotating, untextured cube into a render target image */
-    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.pass });
+    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.attachment });
     sg_apply_pipeline(state.offscreen.pip);
     sg_apply_bindings(&state.offscreen.bind);
 

diff --git a/src/4-11-anti-aliasing/3-grayscale-msaa.c b/src/4-11-anti-aliasing/3-grayscale-msaa.c
@@ -13,8 +13,8 @@
 /* application state */
 static struct {
     struct {
-        sg_attachments pass;
-        sg_attachments_desc pass_desc;
+        sg_attachments attachment;
+        sg_attachments_desc attachment_desc;
         sg_pass_action pass_action;
         sg_pipeline pip;
         sg_bindings bind;
@@ -29,9 +29,9 @@ static struct {
 /* called initially and when window size changes */
 void create_offscreen_pass(int width, int height) {
     /* destroy previous resource (can be called for invalid id) */
-    sg_destroy_attachments(state.offscreen.pass);
-    sg_destroy_image(state.offscreen.pass_desc.colors[0].image);
-    sg_destroy_image(state.offscreen.pass_desc.depth_stencil.image);
+    sg_destroy_attachments(state.offscreen.attachment);
+    sg_destroy_image(state.offscreen.attachment_desc.colors[0].image);
+    sg_destroy_image(state.offscreen.attachment_desc.depth_stencil.image);
 
     /* create offscreen rendertarget images and pass */
     sg_sampler_desc color_smp_desc = {
@@ -58,12 +58,12 @@ void create_offscreen_pass(int width, int height) {
     depth_img_desc.label = "depth-image";
     sg_image depth_img = sg_make_image(&depth_img_desc);
 
-    state.offscreen.pass_desc = (sg_attachments_desc){
+    state.offscreen.attachment_desc = (sg_attachments_desc){
         .colors[0].image = color_img,
         .depth_stencil.image = depth_img,
         .label = "offscreen-pass"
     };
-    state.offscreen.pass = sg_make_attachments(&state.offscreen.pass_desc);
+    state.offscreen.attachment = sg_make_attachments(&state.offscreen.attachment_desc);
 
     /* also need to update the fullscreen-quad texture bindings */
     state.display.bind.fs.images[SLOT__diffuse_texture] = color_img;
@@ -206,7 +206,7 @@ void frame(void) {
     };
 
     /* the offscreen pass, rendering an rotating, untextured cube into a render target image */
-    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.pass });
+    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.attachment });
     sg_apply_pipeline(state.offscreen.pip);
     sg_apply_bindings(&state.offscreen.bind);
 

diff --git a/src/4-5-framebuffers/1-render-to-texture.c b/src/4-5-framebuffers/1-render-to-texture.c
@@ -13,8 +13,8 @@
 /* application state */
 static struct {
     struct {
-        sg_attachments pass;
-        sg_attachments_desc pass_desc;
+        sg_attachments attachment;
+        sg_attachments_desc attachment_desc;
         sg_pass_action pass_action;
         sg_pipeline pip;
         sg_bindings bind_cube;
@@ -37,9 +37,9 @@ static void fail_callback() {
 /* called initially and when window size changes */
 void create_offscreen_pass(int width, int height) {
     /* destroy previous resource (can be called for invalid id) */
-    sg_destroy_attachments(state.offscreen.pass);
-    sg_destroy_image(state.offscreen.pass_desc.colors[0].image);
-    sg_destroy_image(state.offscreen.pass_desc.depth_stencil.image);
+    sg_destroy_attachments(state.offscreen.attachment);
+    sg_destroy_image(state.offscreen.attachment_desc.colors[0].image);
+    sg_destroy_image(state.offscreen.attachment_desc.depth_stencil.image);
 
     /* create offscreen rendertarget images and pass */
     sg_sampler_desc color_smp_desc = {
@@ -65,12 +65,12 @@ void create_offscreen_pass(int width, int height) {
     depth_img_desc.label = "depth-image";
     sg_image depth_img = sg_make_image(&depth_img_desc);
 
-    state.offscreen.pass_desc = (sg_attachments_desc){
+    state.offscreen.attachment_desc = (sg_attachments_desc){
         .colors[0].image = color_img,
         .depth_stencil.image = depth_img,
         .label = "offscreen-pass"
     };
-    state.offscreen.pass = sg_make_attachments(&state.offscreen.pass_desc);
+    state.offscreen.attachment = sg_make_attachments(&state.offscreen.attachment_desc);
 
     /* also need to update the fullscreen-quad texture bindings */
     state.display.bind.fs.images[SLOT__diffuse_texture] = color_img;
@@ -253,7 +253,7 @@ void frame(void) {
     };
 
     /* the offscreen pass, rendering an rotating, untextured cube into a render target image */
-    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.pass });
+    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.attachment });
     sg_apply_pipeline(state.offscreen.pip);
     sg_apply_bindings(&state.offscreen.bind_cube);
 

diff --git a/src/4-5-framebuffers/2-inversion.c b/src/4-5-framebuffers/2-inversion.c
@@ -12,8 +12,8 @@
 /* application state */
 static struct {
     struct {
-        sg_attachments pass;
-        sg_attachments_desc pass_desc;
+        sg_attachments attachment;
+        sg_attachments_desc attachment_desc;
         sg_pass_action pass_action;
         sg_pipeline pip;
         sg_bindings bind_cube;
@@ -36,9 +36,9 @@ static void fail_callback() {
 /* called initially and when window size changes */
 void create_offscreen_pass(int width, int height) {
     /* destroy previous resource (can be called for invalid id) */
-    sg_destroy_attachments(state.offscreen.pass);
-    sg_destroy_image(state.offscreen.pass_desc.colors[0].image);
-    sg_destroy_image(state.offscreen.pass_desc.depth_stencil.image);
+    sg_destroy_attachments(state.offscreen.attachment);
+    sg_destroy_image(state.offscreen.attachment_desc.colors[0].image);
+    sg_destroy_image(state.offscreen.attachment_desc.depth_stencil.image);
 
     /* create offscreen rendertarget images and pass */
     sg_sampler_desc color_smp_desc = {
@@ -64,12 +64,12 @@ void create_offscreen_pass(int width, int height) {
     depth_img_desc.label = "depth-image";
     sg_image depth_img = sg_make_image(&depth_img_desc);
 
-    state.offscreen.pass_desc = (sg_attachments_desc){
+    state.offscreen.attachment_desc = (sg_attachments_desc){
         .colors[0].image = color_img,
         .depth_stencil.image = depth_img,
         .label = "offscreen-pass"
     };
-    state.offscreen.pass = sg_make_attachments(&state.offscreen.pass_desc);
+    state.offscreen.attachment = sg_make_attachments(&state.offscreen.attachment_desc);
 
     /* also need to update the fullscreen-quad texture bindings */
     state.display.bind.fs.images[SLOT__diffuse_texture] = color_img;
@@ -252,7 +252,7 @@ void frame(void) {
     };
 
     /* the offscreen pass, rendering an rotating, untextured cube into a render target image */
-    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.pass });
+    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.attachment });
     sg_apply_pipeline(state.offscreen.pip);
     sg_apply_bindings(&state.offscreen.bind_cube);
 

diff --git a/src/4-5-framebuffers/3-grayscale.c b/src/4-5-framebuffers/3-grayscale.c
@@ -12,8 +12,8 @@
 /* application state */
 static struct {
     struct {
-        sg_attachments pass;
-        sg_attachments_desc pass_desc;
+        sg_attachments attachment;
+        sg_attachments_desc attachment_desc;
         sg_pass_action pass_action;
         sg_pipeline pip;
         sg_bindings bind_cube;
@@ -36,9 +36,9 @@ static void fail_callback() {
 /* called initially and when window size changes */
 void create_offscreen_pass(int width, int height) {
     /* destroy previous resource (can be called for invalid id) */
-    sg_destroy_attachments(state.offscreen.pass);
-    sg_destroy_image(state.offscreen.pass_desc.colors[0].image);
-    sg_destroy_image(state.offscreen.pass_desc.depth_stencil.image);
+    sg_destroy_attachments(state.offscreen.attachment);
+    sg_destroy_image(state.offscreen.attachment_desc.colors[0].image);
+    sg_destroy_image(state.offscreen.attachment_desc.depth_stencil.image);
 
     /* create offscreen rendertarget images and pass */
     sg_sampler_desc color_smp_desc = {
@@ -64,12 +64,12 @@ void create_offscreen_pass(int width, int height) {
     depth_img_desc.label = "depth-image";
     sg_image depth_img = sg_make_image(&depth_img_desc);
 
-    state.offscreen.pass_desc = (sg_attachments_desc){
+    state.offscreen.attachment_desc = (sg_attachments_desc){
         .colors[0].image = color_img,
         .depth_stencil.image = depth_img,
         .label = "offscreen-pass"
     };
-    state.offscreen.pass = sg_make_attachments(&state.offscreen.pass_desc);
+    state.offscreen.attachment = sg_make_attachments(&state.offscreen.attachment_desc);
 
     /* also need to update the fullscreen-quad texture bindings */
     state.display.bind.fs.images[SLOT__diffuse_texture] = color_img;
@@ -252,7 +252,7 @@ void frame(void) {
     };
 
     /* the offscreen pass, rendering an rotating, untextured cube into a render target image */
-    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.pass });
+    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.attachment });
     sg_apply_pipeline(state.offscreen.pip);
     sg_apply_bindings(&state.offscreen.bind_cube);
 

diff --git a/src/4-5-framebuffers/4-sharpen.c b/src/4-5-framebuffers/4-sharpen.c
@@ -12,8 +12,8 @@
 /* application state */
 static struct {
     struct {
-        sg_attachments pass;
-        sg_attachments_desc pass_desc;
+        sg_attachments attachment;
+        sg_attachments_desc attachment_desc;
         sg_pass_action pass_action;
         sg_pipeline pip;
         sg_bindings bind_cube;
@@ -36,9 +36,9 @@ static void fail_callback() {
 /* called initially and when window size changes */
 void create_offscreen_pass(int width, int height) {
     /* destroy previous resource (can be called for invalid id) */
-    sg_destroy_attachments(state.offscreen.pass);
-    sg_destroy_image(state.offscreen.pass_desc.colors[0].image);
-    sg_destroy_image(state.offscreen.pass_desc.depth_stencil.image);
+    sg_destroy_attachments(state.offscreen.attachment);
+    sg_destroy_image(state.offscreen.attachment_desc.colors[0].image);
+    sg_destroy_image(state.offscreen.attachment_desc.depth_stencil.image);
 
     /* create offscreen rendertarget images and pass */
     sg_sampler_desc color_smp_desc = {
@@ -64,12 +64,12 @@ void create_offscreen_pass(int width, int height) {
     depth_img_desc.label = "depth-image";
     sg_image depth_img = sg_make_image(&depth_img_desc);
 
-    state.offscreen.pass_desc = (sg_attachments_desc){
+    state.offscreen.attachment_desc = (sg_attachments_desc){
         .colors[0].image = color_img,
         .depth_stencil.image = depth_img,
         .label = "offscreen-pass"
     };
-    state.offscreen.pass = sg_make_attachments(&state.offscreen.pass_desc);
+    state.offscreen.attachment = sg_make_attachments(&state.offscreen.attachment_desc);
 
     /* also need to update the fullscreen-quad texture bindings */
     state.display.bind.fs.images[SLOT__diffuse_texture] = color_img;
@@ -252,7 +252,7 @@ void frame(void) {
     };
 
     /* the offscreen pass, rendering an rotating, untextured cube into a render target image */
-    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.pass });
+    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.attachment });
     sg_apply_pipeline(state.offscreen.pip);
     sg_apply_bindings(&state.offscreen.bind_cube);
 

diff --git a/src/4-5-framebuffers/5-blur.c b/src/4-5-framebuffers/5-blur.c
@@ -12,8 +12,8 @@
 /* application state */
 static struct {
     struct {
-        sg_attachments pass;
-        sg_attachments_desc pass_desc;
+        sg_attachments attachment;
+        sg_attachments_desc attachment_desc;
         sg_pass_action pass_action;
         sg_pipeline pip;
         sg_bindings bind_cube;
@@ -36,9 +36,9 @@ static void fail_callback() {
 /* called initially and when window size changes */
 void create_offscreen_pass(int width, int height) {
     /* destroy previous resource (can be called for invalid id) */
-    sg_destroy_attachments(state.offscreen.pass);
-    sg_destroy_image(state.offscreen.pass_desc.colors[0].image);
-    sg_destroy_image(state.offscreen.pass_desc.depth_stencil.image);
+    sg_destroy_attachments(state.offscreen.attachment);
+    sg_destroy_image(state.offscreen.attachment_desc.colors[0].image);
+    sg_destroy_image(state.offscreen.attachment_desc.depth_stencil.image);
 
     /* create offscreen rendertarget images and pass */
     sg_sampler_desc color_smp_desc = {
@@ -64,12 +64,12 @@ void create_offscreen_pass(int width, int height) {
     depth_img_desc.label = "depth-image";
     sg_image depth_img = sg_make_image(&depth_img_desc);
 
-    state.offscreen.pass_desc = (sg_attachments_desc){
+    state.offscreen.attachment_desc = (sg_attachments_desc){
         .colors[0].image = color_img,
         .depth_stencil.image = depth_img,
         .label = "offscreen-pass"
     };
-    state.offscreen.pass = sg_make_attachments(&state.offscreen.pass_desc);
+    state.offscreen.attachment = sg_make_attachments(&state.offscreen.attachment_desc);
 
     /* also need to update the fullscreen-quad texture bindings */
     state.display.bind.fs.images[SLOT__diffuse_texture] = color_img;
@@ -252,7 +252,7 @@ void frame(void) {
     };
 
     /* the offscreen pass, rendering an rotating, untextured cube into a render target image */
-    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.pass });
+    sg_begin_pass(&(sg_pass){ .action = state.offscreen.pass_action, .attachments = state.offscreen.attachment });
     sg_apply_pipeline(state.offscreen.pip);
     sg_apply_bindings(&state.offscreen.bind_cube);