From 5389b9ea0e13a984cef0a6aca830c77df7c81cfc Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Wed, 11 May 2011 09:48:36 -0400
Subject: [PATCH] name matrix functions consistently

---
 glslUtil/glslUtil.c | 4 ++--
 glslUtil/glslUtil.h | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

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