From f304aca54204fab2dd674a07f4bf13a6a1581c20 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 3 Nov 2016 09:18:18 +1100 Subject: [PATCH] mesa: move shader_info to the start of gl_program This will allow use to use ralloc_parent() on the info field and fix a regression in nir_sweep() caused by e1af20f18a8. This is intended to be a temporary requirement that will be removed when we finish separating shader_info from nir_shader. Reviewed-by: Eric Anholt --- src/mesa/main/mtypes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 75764cc4e45..08f72e0e41e 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1910,6 +1910,9 @@ typedef enum */ struct gl_program { + /** FIXME: This must be first until we split shader_info from nir_shader */ + struct shader_info info; + mtx_t Mutex; GLuint Id; GLint RefCount; @@ -1922,8 +1925,6 @@ struct gl_program struct nir_shader *nir; - struct shader_info info; - GLbitfield64 SecondaryOutputsWritten; /**< Subset of OutputsWritten outputs written with non-zero index. */ GLbitfield TexturesUsed[MAX_COMBINED_TEXTURE_IMAGE_UNITS]; /**< TEXTURE_x_BIT bitmask */ GLbitfield SamplersUsed; /**< Bitfield of which samplers are used */ -- 2.30.2