josh/glsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change guAttribBinding ptrs to const

Browse Source
This commit is contained in:
Josh Holtrop 2011-05-10 12:13:12 -04:00
parent 335c926876
commit b6a5821fae
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glslUtil/glslUtil.c
View File

@ -274,7 +274,7 @@ GLuint guMakeBuffer(GLenum target, GLenum usage, const void *ptr, size_t sz)
} }
GLuint guMakeProgramFromSource(const char *v_shader, const char *f_shader, GLuint guMakeProgramFromSource(const char *v_shader, const char *f_shader,
guAttribBinding *bindings) const guAttribBinding *bindings)
{ {
GLuint v_shader_id = guMakeShader(GL_VERTEX_SHADER, v_shader); GLuint v_shader_id = guMakeShader(GL_VERTEX_SHADER, v_shader);
GLuint f_shader_id = guMakeShader(GL_FRAGMENT_SHADER, f_shader); GLuint f_shader_id = guMakeShader(GL_FRAGMENT_SHADER, f_shader);
@ -287,7 +287,7 @@ GLuint guMakeProgramFromSource(const char *v_shader, const char *f_shader,
} }
GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader, GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader,
guAttribBinding *bindings) const guAttribBinding *bindings)
{ {
GLuint v_shader_id = guMakeShaderFromFile(GL_VERTEX_SHADER, v_shader); GLuint v_shader_id = guMakeShaderFromFile(GL_VERTEX_SHADER, v_shader);
GLuint f_shader_id = guMakeShaderFromFile(GL_FRAGMENT_SHADER, f_shader); GLuint f_shader_id = guMakeShaderFromFile(GL_FRAGMENT_SHADER, f_shader);
@ -300,7 +300,7 @@ GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader,
} }
GLuint guMakeProgram(GLuint v_shader_id, GLuint f_shader_id, GLuint guMakeProgram(GLuint v_shader_id, GLuint f_shader_id,
guAttribBinding *bindings) const guAttribBinding *bindings)
{ {
GLuint program = glCreateProgram(); GLuint program = glCreateProgram();
glAttachShader(program, v_shader_id); glAttachShader(program, v_shader_id);

6
glslUtil/glslUtil.h
View File

@ -40,11 +40,11 @@ GLuint guMakeShaderFromFile(GLenum shaderType, const char *fname);
GLuint guMakeShader(GLenum shaderType, const char *source); GLuint guMakeShader(GLenum shaderType, const char *source);
GLuint guMakeBuffer(GLenum target, GLenum usage, const void *ptr, size_t sz); GLuint guMakeBuffer(GLenum target, GLenum usage, const void *ptr, size_t sz);
GLuint guMakeProgramFromSource(const char *v_shader, const char *f_shader, GLuint guMakeProgramFromSource(const char *v_shader, const char *f_shader,
guAttribBinding *bindings); const guAttribBinding *bindings);
GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader, GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader,
guAttribBinding *bindings); const guAttribBinding *bindings);
GLuint guMakeProgram(GLuint v_shader_id, GLuint f_shader_id, GLuint guMakeProgram(GLuint v_shader_id, GLuint f_shader_id,
guAttribBinding *bindings); const guAttribBinding *bindings);
#ifdef __cplusplus #ifdef __cplusplus
} }