On Fri, Feb 5, 2016 at 8:57 PM, Ian Romanick <i...@freedesktop.org> wrote: > On 01/30/2016 06:48 AM, Marek Olšák wrote: >> From: Marek Olšák <marek.ol...@amd.com> >> >> to allow LinkShader to free the GLSL IR. >> --- >> src/compiler/glsl/program.h | 5 ++++- >> src/mesa/drivers/dri/i965/brw_link.cpp | 2 ++ > > I think i915 should get the same treatment, right? Or does it pick it > up via the first hunk in the patch to ir_to_mesa?
Yes, ir_to_mesa. > >> src/mesa/program/ir_to_mesa.cpp | 4 ++-- >> src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 +++ >> 4 files changed, 11 insertions(+), 3 deletions(-) >> >> diff --git a/src/compiler/glsl/program.h b/src/compiler/glsl/program.h >> index 64f5463..31bb9aa 100644 >> --- a/src/compiler/glsl/program.h >> +++ b/src/compiler/glsl/program.h >> @@ -22,12 +22,15 @@ >> * OTHER DEALINGS IN THE SOFTWARE. >> */ >> >> -#include "main/core.h" >> >> #ifdef __cplusplus >> extern "C" { >> #endif >> >> +struct gl_context; >> +struct gl_shader; >> +struct gl_shader_program; >> + > > This hunk seems spurious, but should be fine. Did you build all the > drivers to be sure this doesn't break someone? Yes, it doesn't break anything. It's required to silence compile warnings (mesa vs gallium conflicts of definitions). Marek _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev