[Mesa-dev] [PATCH 2/2] glsl: Rename variable_entry2 to variable_entry.

[Kenneth Graunke]

On 01/28/2012 04:58 PM, Kenneth Graunke wrote:
> This should be safe now that ir_variable_refcount.h doesn't expose a
> type with the same name.  The only other type with the same name is
> in brw_fs_vector_splitting.cpp, but both of these should be file-scope,
> so I don't expect problems.
>
> Signed-off-by: Kenneth Graunke<kenneth at whitecape.org>
> Reviewed-and-tested-by: Matt Turner<mattst88 at gmail.com>
> ---
>   src/glsl/opt_structure_splitting.cpp |   38 +++++++++++++++------------------
>   1 files changed, 17 insertions(+), 21 deletions(-)
>
> I'm not entirely confident in this patch.  It shouldn't cause problems on
> MSVC because MSVC doesn't build the i965 driver.

NAK on this patch.  After talking to Paul, we concluded that this won't 
work: both of the classes will be visible, and <misc> will happen.  The 
solution is apparently to use anonymous namespaces.

We can just drop this one for now, since it's already named uniquely and 
working fine.  Patch 1 is still good and worth putting in.