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:
@@ -1945,7 +1945,11 @@ struct gl_program
|
|||||||
/** Map from sampler unit to texture unit (set by glUniform1i()) */
|
/** Map from sampler unit to texture unit (set by glUniform1i()) */
|
||||||
GLubyte SamplerUnits[MAX_SAMPLERS];
|
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 */
|
/** Fields used by GLSL programs */
|
||||||
struct {
|
struct {
|
||||||
struct gl_active_atomic_buffer **AtomicBuffers;
|
struct gl_active_atomic_buffer **AtomicBuffers;
|
||||||
|
Reference in New Issue
Block a user