On Thu, Sep 17, 2015 at 8:35 PM, Dieter Nützel <die...@nuetzel-hh.de> wrote: > Am 18.09.2015 02:27, schrieb Rob Clark: >> >> On Thu, Sep 17, 2015 at 8:03 PM, Timothy Arceri <t_arc...@yahoo.com.au> >> wrote: >>> >>> On Thu, 2015-09-17 at 18:20 -0400, Rob Clark wrote: >>>> >>>> From: Rob Clark <robcl...@freedesktop.org> >>>> >>>> Signed-off-by: Rob Clark <robcl...@freedesktop.org> >>>> --- >>>> src/glsl/nir/nir.h | 10 +++++----- >>>> 1 file changed, 5 insertions(+), 5 deletions(-) >>>> >>>> diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h >>>> index 297858a..9d8c3f4 100644 >>>> --- a/src/glsl/nir/nir.h >>>> +++ b/src/glsl/nir/nir.h >>>> @@ -1451,13 +1451,13 @@ typedef struct nir_shader_compiler_options { >>>> } nir_shader_compiler_options; >>>> >>>> typedef struct nir_shader { >>>> - /** hash table of name -> uniform nir_variable */ >>>> + /** list of uniforms (nir_variable) */ >>>> struct exec_list uniforms; >>>> >>>> - /** hash table of name -> input nir_variable */ >>>> + /** list of inputs (nir_variable) */ >>>> struct exec_list inputs; >>>> >>>> - /** hash table of name -> output nir_variable */ >>>> + /** list of outputs (nir_variable) */ >>>> struct exec_list outputs; >>>> >>>> /** Set of driver-specific options for the shader. >>>> @@ -1467,10 +1467,10 @@ typedef struct nir_shader { >>>> */ >>>> const struct nir_shader_compiler_options *options; >>>> >>>> - /** list of global variables in the shader */ >>>> + /** list of global variables in the shader (nir_variable) */ >>>> struct exec_list globals; >>>> >>>> - /** list of system value variables in the shader */ >>>> + /** list of system value variables in the shade (nir_variable)r >>> >>> >>> >>> The above comment is broken. With that fixed both patches are: >>> >>> Reviewed-by: Timothy Arceri <t_arc...@yahoo.com.au> >> >> >> oh, whoops.. thanks, fixed and pushed >> >> BR, >> -R > > > Rob, > > you committed the broken one...
are you sure? http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba78260b0fbd291618df63bc7a54be0a36148b40 looks ok to me.. I assume 'broken' == the stray character that snuck in there but maybe I am missing something.. (it is quite possible that I am overdue for a new prescription of eye-glasses :-P) BR, -R > -Dieter > >>> >>>> */ >>>> struct exec_list system_values; >>>> >>>> struct exec_list functions; /** < list of nir_function */ >> >> _______________________________________________ >> mesa-dev mailing list >> mesa-dev@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/mesa-dev > > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev