On 04/12/2014 02:20 AM, Chris Forbes wrote: > The rules are about to get a bit more complex to account for > gl_InstanceID and gl_VertexID, which are system values. > > Extracting this first avoids introducing duplication. > > Signed-off-by: Chris Forbes <[email protected]> > --- > src/mesa/main/shader_query.cpp | 26 ++++++++++++++++++-------- > 1 file changed, 18 insertions(+), 8 deletions(-) > > diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp > index e1afe53..c6e7342 100644 > --- a/src/mesa/main/shader_query.cpp > +++ b/src/mesa/main/shader_query.cpp > @@ -76,6 +76,20 @@ _mesa_BindAttribLocation(GLhandleARB program, GLuint index, > */ > } > > +static bool > +is_active_attrib(const ir_variable *var) {
{ goes on its own line.
With that fixed, these two get:
Reviewed-by: Kenneth Graunke <[email protected]>
I like the refactor here. Nice catch in patch 2.
> + if (!var)
> + return false;
> +
> + switch (var->data.mode) {
> + case ir_var_shader_in:
> + return var->data.location != -1;
> +
> + default:
> + return false;
> + }
> +}
> +
> void GLAPIENTRY
> _mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index,
> GLsizei maxLength, GLsizei * length, GLint * size,
> @@ -105,10 +119,8 @@ _mesa_GetActiveAttrib(GLhandleARB program, GLuint
> desired_index,
> foreach_list(node, ir) {
> const ir_variable *const var = ((ir_instruction *)
> node)->as_variable();
>
> - if (var == NULL
> - || var->data.mode != ir_var_shader_in
> - || var->data.location == -1)
> - continue;
> + if (!is_active_attrib(var))
> + continue;
>
> if (current_index == desired_index) {
> _mesa_copy_string(name, maxLength, length, var->name);
> @@ -196,10 +208,8 @@ _mesa_count_active_attribs(struct gl_shader_program
> *shProg)
> foreach_list(node, ir) {
> const ir_variable *const var = ((ir_instruction *)
> node)->as_variable();
>
> - if (var == NULL
> - || var->data.mode != ir_var_shader_in
> - || var->data.location == -1)
> - continue;
> + if (!is_active_attrib(var))
> + continue;
>
> i++;
> }
>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
