diff options
| author | Jose Fonseca <[email protected]> | 2015-04-16 10:19:57 +0100 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2015-04-16 10:23:24 +0100 |
| commit | 037e0e78abf0c312f737d33f3c33e37b22bf226d (patch) | |
| tree | c2f6edf3dabcb8c66f354d688300a63783d8d00f /src/mesa/main/shaderapi.h | |
| parent | f78b2c432f31a18794b9f62f0a0cfb8eca256151 (diff) | |
mesa,glsl: rename `interface` to `programInterface`.
`interface` is a define on Windows -- an alias for `struct` keyword,
used when declaring COM interfaces in C or C++.
So use instead `programInterface`, therefore matching the name used
in GL_ARB_program_interface_query spec/headers, which was renamed exactly
for the same reason:
"Revision 10, May 10, 2012 (pbrown)
- Rename the formal parameter <interface> used by the functions in this
extension to <programInterface>. Certain versions of the Microsoft
C/C++ compiler and/or its headers cause "interface" to be treated as a
reserved keyword."
Trivial.
Diffstat (limited to 'src/mesa/main/shaderapi.h')
| -rw-r--r-- | src/mesa/main/shaderapi.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 0cd2fad5d18..aba6d5d8306 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -232,25 +232,25 @@ _mesa_program_resource_index(struct gl_shader_program *shProg, extern struct gl_program_resource * _mesa_program_resource_find_name(struct gl_shader_program *shProg, - GLenum interface, const char *name); + GLenum programInterface, const char *name); extern struct gl_program_resource * _mesa_program_resource_find_index(struct gl_shader_program *shProg, - GLenum interface, GLuint index); + GLenum programInterface, GLuint index); extern bool _mesa_get_program_resource_name(struct gl_shader_program *shProg, - GLenum interface, GLuint index, + GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name, const char *caller); extern GLint _mesa_program_resource_location(struct gl_shader_program *shProg, - GLenum interface, const char *name); + GLenum programInterface, const char *name); extern GLint _mesa_program_resource_location_index(struct gl_shader_program *shProg, - GLenum interface, const char *name); + GLenum programInterface, const char *name); extern unsigned _mesa_program_resource_prop(struct gl_shader_program *shProg, @@ -259,7 +259,7 @@ _mesa_program_resource_prop(struct gl_shader_program *shProg, extern void _mesa_get_program_resourceiv(struct gl_shader_program *shProg, - GLenum interface, GLuint index, + GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params); |