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
This commit is contained in:
Timothy Arceri 2016-12-31 07:45:35 +11:00
parent c2799a80c5
commit 9d99dc4bc1
1 changed files with 5 additions and 1 deletions

View File

@ -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;