diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-12-31 07:45:35 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-12-31 09:00:05 +1100 |
| commit | 9d99dc4bc1fda9906e8dc576d6116fbdb05f67ac (patch) | |
| tree | b4a1337e282632ac4556b50aa88da3211bb6c270 | |
| parent | c2799a80c5d7835d9c79ef8f7dcd6da0ca89ceb6 (diff) | |
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
| -rw-r--r-- | src/mesa/main/mtypes.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 69d2eeeaf3..39ae667461 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; |