Mesa (master): mesa: make union in gl_program a struct and add FIXME

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 9d99dc4bc1fda9906e8dc576d6116fbdb05f67ac
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d99dc4bc1fda9906e8dc576d6116fbdb05f67ac

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Sat Dec 31 07:45:35 2016 +1100

mesa: make union in gl_program a struct and add FIXME

i915 is mixing the use of these fields, for now change this to a
struct and add a FIXME.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
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;