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/glsl/linker.cpp | |
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/glsl/linker.cpp')
-rw-r--r-- | src/glsl/linker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 651ecd85a15..b6baa5d36f0 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -2552,7 +2552,7 @@ build_stageref(struct gl_shader_program *shProg, const char *name) static bool add_interface_variables(struct gl_shader_program *shProg, - struct gl_shader *sh, GLenum interface) + struct gl_shader *sh, GLenum programInterface) { foreach_in_list(ir_instruction, node, sh->ir) { ir_variable *var = node->as_variable(); @@ -2572,18 +2572,18 @@ add_interface_variables(struct gl_shader_program *shProg, var->data.location != SYSTEM_VALUE_INSTANCE_ID) continue; case ir_var_shader_in: - if (interface != GL_PROGRAM_INPUT) + if (programInterface != GL_PROGRAM_INPUT) continue; break; case ir_var_shader_out: - if (interface != GL_PROGRAM_OUTPUT) + if (programInterface != GL_PROGRAM_OUTPUT) continue; break; default: continue; }; - if (!add_program_resource(shProg, interface, var, + if (!add_program_resource(shProg, programInterface, var, build_stageref(shProg, var->name))) return false; } |