diff options
| author | Andre Weissflog <floooh@gmail.com> | 2024-09-02 13:02:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 13:02:32 +0200 |
| commit | ec18cd9eacde0cf641f3403eaaeac123e6155ff8 (patch) | |
| tree | af72bf4d488c0477108bdc4c1e19e46614bf7fe9 | |
| parent | 189843bf4f86969ca4cc4b6d94e793a37c5128a7 (diff) | |
| parent | 01f4dcf46225cc78ac4c36d6ff83c1cc59f4ba22 (diff) | |
Merge pull request #1102 from waywardmonkeys/fix-typos
Fix typos.
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | bindgen/gen_zig.py | 2 | ||||
| -rw-r--r-- | sokol_gfx.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d73e84c8..c2a014b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ change in the Zig stdlib. The fix supports both the old and new naming convention so that sokol-zig continues to be compatible with zig 0.13.0. - To update the sokol-zig depenency in your project, just run: + To update the sokol-zig dependency in your project, just run: ``` zig fetch --save=sokol git+https://github.com/floooh/sokol-zig.git @@ -57,7 +57,7 @@ Also see ticket https://github.com/floooh/sokol/issues/1092 and PR https://githu ### 14-Aug-2024 -The previously 'inofficial' Jai bindings at https://github.com/colinbellino/sokol-jai +The previously 'unofficial' Jai bindings at https://github.com/colinbellino/sokol-jai have now been properly integrated with the sokol main repository (meaning that each change to the sokol headers will update the bindings automatically). @@ -301,7 +301,7 @@ Storage buffer support is not available on the following platform/backend combos - likewise, by default sokol_app.h now creates a GL 4.1 context on macOS and a GL 4.3 context on other desktop platforms when `SOKOL_GLCORE` is defined - if you're passing WGSL shaders directly into sokol_gfx.h (instead of using sokol-shdc), please - be aware that the binding offets for the different shader resource types have moved: + be aware that the binding offsets for the different shader resource types have moved: - vertex shader stage: - textures: `@group(1) @binding(0..15)` - samplers: `@group(1) @binding(16..31)` diff --git a/bindgen/gen_zig.py b/bindgen/gen_zig.py index 7b537586..811f7a95 100644 --- a/bindgen/gen_zig.py +++ b/bindgen/gen_zig.py @@ -65,7 +65,7 @@ overrides = { 'sdtx_font.font_index': 'uint32_t', 'SGL_NO_ERROR': 'SGL_ERROR_NO_ERROR', 'sfetch_continue': 'continue_fetching', # 'continue' is reserved in Zig - 'sfetch_desc': 'sfetch_get_desc' # 'desc' shadowed by earlier definiton + 'sfetch_desc': 'sfetch_get_desc' # 'desc' shadowed by earlier definition } prim_types = { diff --git a/sokol_gfx.h b/sokol_gfx.h index 7e94f9d1..57c24a7b 100644 --- a/sokol_gfx.h +++ b/sokol_gfx.h @@ -963,7 +963,7 @@ ON STORAGE BUFFERS ================== Storage buffers can be used to pass large amounts of random access structured - data fromt the CPU side to the shaders. They are similar to data textures, but are + data from the CPU side to the shaders. They are similar to data textures, but are more convenient to use both on the CPU and shader side since they can be accessed in shaders as as a 1-dimensional array of struct items. |