diff --git a/glslUtil/glslUtil.c b/glslUtil/glslUtil.c index b29133c..b72f128 100644 --- a/glslUtil/glslUtil.c +++ b/glslUtil/glslUtil.c @@ -141,7 +141,7 @@ void guMatrixFrustum(guMatrix4x4 *m, guMatrixMult(m, m, &mult); } -void guPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect, +void guMatrixPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect, GLfloat near, GLfloat far) { int i, j; @@ -163,7 +163,7 @@ void guPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect, guMatrixMult(m, m, &mult); } -void guOrtho(guMatrix4x4 *m, +void guMatrixOrtho(guMatrix4x4 *m, GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat near, GLfloat far) diff --git a/glslUtil/glslUtil.h b/glslUtil/glslUtil.h index fbed09d..e9d5292 100644 --- a/glslUtil/glslUtil.h +++ b/glslUtil/glslUtil.h @@ -28,17 +28,17 @@ void guMatrixFrustum(guMatrix4x4 *m, GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat near, GLfloat far); -void guPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect, +void guMatrixPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect, GLfloat near, GLfloat far); -void guOrtho(guMatrix4x4 *m, +void guMatrixOrtho(guMatrix4x4 *m, GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat near, GLfloat far); + char *guGetShaderLog(GLuint id); char *guGetProgramLog(GLuint id); GLuint guMakeShaderFromFile(GLenum shaderType, const char *fname); GLuint guMakeShader(GLenum shaderType, const char *source); -GLuint guMakeBuffer(GLenum target, GLenum usage, const void *ptr, size_t sz); GLuint guMakeProgramFromSource(const char *v_shader, const char *f_shader, const guAttribBinding *bindings); GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader, @@ -46,6 +46,8 @@ GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader, GLuint guMakeProgram(GLuint v_shader_id, GLuint f_shader_id, const guAttribBinding *bindings); +GLuint guMakeBuffer(GLenum target, GLenum usage, const void *ptr, size_t sz); + #ifdef __cplusplus } #endif