diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
| commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
| tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /mesalib/src/mesa/main/shader_query.cpp | |
| parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'mesalib/src/mesa/main/shader_query.cpp')
| -rw-r--r-- | mesalib/src/mesa/main/shader_query.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/shader_query.cpp b/mesalib/src/mesa/main/shader_query.cpp index 38bacdb74..8ab18126c 100644 --- a/mesalib/src/mesa/main/shader_query.cpp +++ b/mesalib/src/mesa/main/shader_query.cpp @@ -107,8 +107,7 @@ _mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index, if (var == NULL || var->mode != ir_var_in - || var->location == -1 - || var->location < VERT_ATTRIB_GENERIC0) + || var->location == -1) continue; if (current_index == desired_index) { @@ -199,8 +198,7 @@ _mesa_count_active_attribs(struct gl_shader_program *shProg) if (var == NULL || var->mode != ir_var_in - || var->location == -1 - || var->location < VERT_ATTRIB_GENERIC0) + || var->location == -1) continue; i++; @@ -226,8 +224,7 @@ _mesa_longest_attribute_name_length(struct gl_shader_program *shProg) if (var == NULL || var->mode != ir_var_in - || var->location == -1 - || var->location < VERT_ATTRIB_GENERIC0) + || var->location == -1) continue; const size_t len = strlen(var->name); |