Merge pull request #460 from raziel-/fix-typos

JANITORIAL: Fix another small bunch of typos

CHANGELOG.md

@@ -33,7 +33,7 @@ Version history
 * Added support for multiple FBO attachement (if hardware support it)
 
 ##### v1.1.2
-* Improved a bit the merger (wich merge subsequent `glBegin(...)`/`glEnd()`) efficiency
+* Improved a bit the merger (which merge subsequent `glBegin(...)`/`glEnd()`) efficiency
 * Removed LIBGL_BEGINEND=2 (that was not working correctly, and it complexify the code too much)
 * Added some Direct Access function (from EXT_direct_access)
 * Fixes and Improvements on depth (and depth_Stencil) Texture handling

USAGE.md

@@ -248,7 +248,7 @@ Comments in shaders are kept (also for generated shaders by fpe_shaders)
 
 ##### LIBGL_DEFAULTWRAP
 Hack to define default WRAP mode for texture
-* 0 : Default wrap mode is GL_REPEAT (normal OpenGL behavour): default on NPOT hardware
+* 0 : Default wrap mode is GL_REPEAT (normal OpenGL behaviour): default on NPOT hardware
 * 1 : Default wrap mode is GL_CLAMP_TO_EDGE: default on limited NPOT or non-NPOT hardware
 * 2 : Default wrap mode is GL_CLAMP_TO_EDGE, enforced (not advised)
 
@@ -265,7 +265,7 @@ For the Color Attachment 0 to be a Texture2D (even if program attachs a Renderbu
 ##### LIBGL_BLITFULLSCREEN
 Hack to trigger a SwapBuffers when a Full Framebuffer Blit on default FBO is done
 * 0 : Don't force
-* 1 : Default: Activate the hack (usefull with Wine/D3D)
+* 1 : Default: Activate the hack (useful with Wine/D3D)
 
 ##### LIBGL_NOARBPROGRAM
 Don't expose ARB Program extensions (GL_ARB_vertex_program, GL_ARB_fragment_program and GL_EXT_program_parameters)

src/gl/glstate.h

@@ -82,7 +82,7 @@ typedef struct glstate_s {
     gleshard_t          *gleshard;          //shared
     glesblit_t          *blit;
     fbo_t               fbo;
-    int                 fbowidth, fboheight;    // initial size (usefull only on LIBGL_FB=1 or 2)
+    int                 fbowidth, fboheight;    // initial size (useful only on LIBGL_FB=1 or 2)
     depth_state_t       depth;
     face_state_t        face;
     GLint               instanceID;

src/gl/program.c

@@ -134,8 +134,8 @@ GLuint APIENTRY_GL4ES gl4es_glCreateProgram(void) {
     return program;
 }
 
-void actualy_deleteshader(GLuint shader);
-void actualy_detachshader(GLuint shader);
+void actually_deleteshader(GLuint shader);
+void actually_detachshader(GLuint shader);
 
 void deleteProgram(program_t *glprogram, khint_t k_program) {
     free(glprogram->attach);
@@ -183,7 +183,7 @@ void APIENTRY_GL4ES gl4es_glDeleteProgram(GLuint program) {
     // TODO: check GL ERROR to not clean in case of error?
     // clean attached shaders
     for (int i=0; i<glprogram->attach_size; i++) {
-        actualy_detachshader(glprogram->attach[i]); // auto delete if marqued as delete!
+        actually_detachshader(glprogram->attach[i]); // auto delete if marked as delete!
     }
     deleteProgram(glprogram, k_program);
 }
@@ -210,7 +210,7 @@ void APIENTRY_GL4ES gl4es_glDetachShader(GLuint program, GLuint shader) {
     } else
         noerrorShim();
     // marked as detached
-    actualy_detachshader(shader);
+    actually_detachshader(shader);
 }
 
 void APIENTRY_GL4ES gl4es_glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name) {

src/gl/shader.c

@@ -64,7 +64,7 @@ GLuint APIENTRY_GL4ES gl4es_glCreateShader(GLenum shaderType) {
     return shader;
 }
 
-void actualy_deleteshader(GLuint shader) {
+void actually_deleteshader(GLuint shader) {
     khint_t k;
     khash_t(shaderlist) *shaders = glstate->glsl->shaders;
     k = kh_get(shaderlist, shaders, shader);
@@ -81,14 +81,14 @@ void actualy_deleteshader(GLuint shader) {
     }
 }
 
-void actualy_detachshader(GLuint shader) {
+void actually_detachshader(GLuint shader) {
     khint_t k;
     khash_t(shaderlist) *shaders = glstate->glsl->shaders;
     k = kh_get(shaderlist, shaders, shader);
     if (k != kh_end(shaders)) {
         shader_t *glshader = kh_value(shaders, k);
         if((--glshader->attached)<1 && glshader->deleted)
-            actualy_deleteshader(shader); 
+            actually_deleteshader(shader); 
     }
 }
 
@@ -104,7 +104,7 @@ void APIENTRY_GL4ES gl4es_glDeleteShader(GLuint shader) {
     glshader->deleted = 1;
     noerrorShim();
     if(!glshader->attached) {
-        actualy_deleteshader(shader);
+        actually_deleteshader(shader);
 
         // delete the shader in GLES2 hardware (if any)
         LOAD_GLES2(glDeleteShader);

src/gl/texture_params.c

@@ -197,7 +197,7 @@ void APIENTRY_GL4ES gl4es_glBindTexture(GLenum target, GLuint texture) {
 
         LOAD_GLES(glBindTexture);
         switch(target) {
-            // cube map are bounded immediately, other are defered and will be applied with realize_bound or realize_textures
+            // cube map are immediately bound, other are defered and will be applied with realize_bound or realize_textures
             case GL_TEXTURE_CUBE_MAP:
             case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
             case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: