[Mesa-dev] [PATCH] mesa: make union in gl_program a struct and add FIXME

[Kenneth Graunke]

On Saturday, December 31, 2016 7:45:35 AM PST Timothy Arceri wrote:
> i915 is mixing the use of these fields, for now change this to a
> struct and add a FIXME.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99229
> ---
>  src/mesa/main/mtypes.h | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 69d2eee..39ae667 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -1945,7 +1945,11 @@ struct gl_program
>     /** Map from sampler unit to texture unit (set by glUniform1i()) */
>     GLubyte SamplerUnits[MAX_SAMPLERS];
>  
> -   union {
> +   /* FIXME: We should be able to make this struct a union. However some
> +    * drivers (i915/fragment_programs, swrast/prog_execute) mix the use of
> +    * these fields, we should fix this.
> +    */
> +   struct {
>        /** Fields used by GLSL programs */
>        struct {
>           struct gl_active_atomic_buffer **AtomicBuffers;
> 

Thanks Tim.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20161230/aa985137/attachment-0001.sig>