From e81aaeba37f5419323d8f88bc10943c77e25ed14 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 20 Oct 2016 14:24:03 +1100 Subject: r200/i915/st/mesa/compiler: use common inputs read field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And set set inputs_read directly in shader_info. To avoid regressions between changes this change is a squashed version of the following patches. st/mesa changes where: Reviewed-by: Marek Olšák Reviewed-by: Jason Ekstrand --- src/mesa/main/state.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/main/state.h') diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h index 8b6f54b9ca8..7a6cdacf471 100644 --- a/src/mesa/main/state.h +++ b/src/mesa/main/state.h @@ -61,12 +61,12 @@ _mesa_need_secondary_color(const struct gl_context *ctx) if (ctx->VertexProgram._Current && (ctx->VertexProgram._Current != ctx->VertexProgram._TnlProgram) && - (ctx->VertexProgram._Current->InputsRead & VERT_BIT_COLOR1)) + (ctx->VertexProgram._Current->info.inputs_read & VERT_BIT_COLOR1)) return GL_TRUE; if (ctx->FragmentProgram._Current && (ctx->FragmentProgram._Current != ctx->FragmentProgram._TexEnvProgram) && - (ctx->FragmentProgram._Current->InputsRead & VARYING_BIT_COL1)) + (ctx->FragmentProgram._Current->info.inputs_read & VARYING_BIT_COL1)) return GL_TRUE; return GL_FALSE; -- cgit v1.2.3