summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Weissflog <floooh@gmail.com>2020-01-30 16:19:07 +0100
committerGitHub <noreply@github.com>2020-01-30 16:19:07 +0100
commit1ff62048cf5e2c09c1c1d64c8e98c28e3d2e04c3 (patch)
tree8cde0f889b2dd3b0ffefe47f08528b865a998417
parentc13e31658eecef87af6f94dc7150e289e2778b5e (diff)
parent0a4a137913869a1c551b8865ea069fb9b4324c43 (diff)
Merge pull request #258 from waywardmonkeys/fix-typos
Fix typos.
-rw-r--r--README.md10
-rw-r--r--sokol_app.h2
-rw-r--r--sokol_audio.h2
-rw-r--r--sokol_fetch.h8
-rw-r--r--util/sokol_gl.h2
5 files changed, 12 insertions, 12 deletions
diff --git a/README.md b/README.md
index 476b6efa..b7301377 100644
--- a/README.md
+++ b/README.md
@@ -330,7 +330,7 @@ static void frame(void) {
}
// the response callback is where the interesting stuff happens:
-static void reponse_callback(const sfetch_response_t* response) {
+static void response_callback(const sfetch_response_t* response) {
if (response->fetched) {
// data has been loaded into the provided buffer, do something
// with the data...
@@ -482,7 +482,7 @@ Mainly some "missing features" for desktop apps:
on and support the new [permission-based clipboard
API](https://developer.mozilla.org/en-US/docs/Web/API/Clipboard_API).
- For documention of the clipboard feature, search for CLIPBOARD SUPPORT
+ For documentation of the clipboard feature, search for CLIPBOARD SUPPORT
in sokol_app.h
- **08-Sep-2019**: sokol_gfx.h now supports clamp-to-border texture sampling:
@@ -730,7 +730,7 @@ layout definition in sg_pipeline_desc works:
Vertex component names and semantics (needed by the GLES2 and D3D11 backends) have moved from ```sg_pipeline_desc``` into ```sg_shader_desc```.
- This may seem like a rather pointless small detail to change, expecially
+ This may seem like a rather pointless small detail to change, especially
for breaking existing code, but the whole thing will make a bit more
sense when the new shader-cross-compiler will be integrated which I'm
currently working on (here: https://github.com/floooh/sokol-tools).
@@ -743,7 +743,7 @@ layout definition in sg_pipeline_desc works:
vertex-component **slots**. Instead of (optionally) mapping this
association through a name, the pipeline's vertex layout is now always
strictly defined in terms of numeric 'bind slots' for **all** sokol_gfx.h
- backends. For 3D APIs where the vertex component slot isn't explicitely
+ backends. For 3D APIs where the vertex component slot isn't explicitly
defined in the shader language (GLES2/WebGL, D3D11, and optionally
GLES3/GL), the shader merely offers a lookup table how vertex-layout
slot-indices map to names/semantics (and the underlying 3D API than maps
@@ -871,7 +871,7 @@ pipeline-state-objects), along with a couple of other minor API tweaks.
sgl_pop_pipeline();
```
- You can also load the 'default pipeline' explicitely on the top of the
+ You can also load the 'default pipeline' explicitly on the top of the
pipeline stack with ```sgl_default_pipeline()```.
The other API change is:
diff --git a/sokol_app.h b/sokol_app.h
index abb5d248..d8947fe5 100644
--- a/sokol_app.h
+++ b/sokol_app.h
@@ -273,7 +273,7 @@
- the user or application code has asked to quit the application
- a string was pasted to the system clipboard
- To explicitely 'consume' an event and prevent that the event is
+ To explicitly 'consume' an event and prevent that the event is
forwarded for further handling to the operating system, call
sapp_consume_event() from inside the event handler (NOTE that
this behaviour is currently only implemented for some HTML5
diff --git a/sokol_audio.h b/sokol_audio.h
index 6e281a7e..96dd100e 100644
--- a/sokol_audio.h
+++ b/sokol_audio.h
@@ -318,7 +318,7 @@
WASAPI may use a different size for its own streaming buffer then requested,
so the base latency may be slightly bigger. The current backend implementation
- convertes the incoming floating point sample values to signed 16-bit
+ converts the incoming floating point sample values to signed 16-bit
integers.
The required Windows system DLLs are linked with #pragma comment(lib, ...),
diff --git a/sokol_fetch.h b/sokol_fetch.h
index 1641856c..63e9f1ac 100644
--- a/sokol_fetch.h
+++ b/sokol_fetch.h
@@ -282,9 +282,9 @@
last call to sfetch_dowork() will be dispatched to their IO channels
and assigned a free lane. If all lanes on that channel are occupied
by requests 'in flight', incoming requests must wait until
- a lane becomes avaible
+ a lane becomes available
- - for all new requests which have been enquened on a channel which
+ - for all new requests which have been enqueued on a channel which
don't already have a buffer assigned the response callback will be
called with (response->dispatched == true) so that the response
callback can inspect the dynamically assigned lane and bind a buffer
@@ -379,7 +379,7 @@
sfetch_desc_t sfetch_desc(void)
-------------------------------
sfetch_desc() returns a copy of the sfetch_desc_t struct passed to
- sfetch_setup(), with zero-inititialized values replaced with
+ sfetch_setup(), with zero-initialized values replaced with
their default values.
int sfetch_max_userdata_bytes(void)
@@ -634,7 +634,7 @@
sfetch_send(&(sfetch_request_t){
.path = "my_file.txt",
- .callback = my_reponse_callback,
+ .callback = my_response_callback,
.channel = 2
});
diff --git a/util/sokol_gl.h b/util/sokol_gl.h
index 0a46e64a..2a306c4b 100644
--- a/util/sokol_gl.h
+++ b/util/sokol_gl.h
@@ -281,7 +281,7 @@
sgl_begin_triangle_strip()
sgl_begin_quads()
- ...after sgl_begin_*() specifiy vertices:
+ ...after sgl_begin_*() specify vertices:
sgl_v*(...)
sgl_v*_t*(...)