aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-05-11 17:40:10 +0200
committermarha <marha@users.sourceforge.net>2014-05-11 17:40:10 +0200
commitae06feae7876db47ff0e1fde40cf4a324a412037 (patch)
tree4d3879532d8c4c7488d70d02c686586d1a4d28fc /mesalib/src/glsl
parent683155917770af9e63a938bc450df25d1904d567 (diff)
downloadvcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.tar.gz
vcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.tar.bz2
vcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.zip
mesa git update 11 May 2014
mesa commit 83b4ec03e77645c537d540a12253b3492bad4b59
Diffstat (limited to 'mesalib/src/glsl')
-rw-r--r--mesalib/src/glsl/link_varyings.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/glsl/link_varyings.cpp b/mesalib/src/glsl/link_varyings.cpp
index ac38a2f31..71998dfa9 100644
--- a/mesalib/src/glsl/link_varyings.cpp
+++ b/mesalib/src/glsl/link_varyings.cpp
@@ -992,7 +992,7 @@ varying_matches::match_comparator(const void *x_generic, const void *y_generic)
* varyings, but excludes variables such as gl_FrontFacing and gl_FragCoord.
*/
static bool
-is_varying_var(gl_shader_stage stage, const ir_variable *var)
+var_counts_against_varying_limit(gl_shader_stage stage, const ir_variable *var)
{
/* Only fragment shaders will take a varying variable as an input */
if (stage == MESA_SHADER_FRAGMENT &&
@@ -1462,7 +1462,7 @@ check_against_output_limit(struct gl_context *ctx,
ir_variable *const var = ((ir_instruction *) node)->as_variable();
if (var && var->data.mode == ir_var_shader_out &&
- is_varying_var(producer->Stage, var)) {
+ var_counts_against_varying_limit(producer->Stage, var)) {
output_vectors += var->type->count_attribute_slots();
}
}
@@ -1501,7 +1501,7 @@ check_against_input_limit(struct gl_context *ctx,
ir_variable *const var = ((ir_instruction *) node)->as_variable();
if (var && var->data.mode == ir_var_shader_in &&
- is_varying_var(consumer->Stage, var)) {
+ var_counts_against_varying_limit(consumer->Stage, var)) {
input_vectors += var->type->count_attribute_slots();
}
}