Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos. #1102

Merged
merged 1 commit into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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).

Expand Down Expand Up @@ -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)`
Expand Down
2 changes: 1 addition & 1 deletion bindgen/gen_zig.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
'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 = {
Expand Down
2 changes: 1 addition & 1 deletion sokol_gfx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down