From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Fri, 30 Dec 2016 20:45:35 +0000 (+1100)
Subject: mesa: make union in gl_program a struct and add FIXME
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d99dc4bc1fda9906e8dc576d6116fbdb05f67ac;p=mesa.git

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@whitecape.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99229
---

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 69d2eeeaf31..39ae6674614 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;