diff options
| author | Timothy Arceri <[email protected]> | 2016-10-20 14:24:03 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | e81aaeba37f5419323d8f88bc10943c77e25ed14 (patch) | |
| tree | 3dc9c65fd0984128fb559aa71ed4ae4c7493995e /src/mesa/main/state.h | |
| parent | dfcbdba47119de6c1d81a869f8625bcc3d7560a2 (diff) | |
r200/i915/st/mesa/compiler: use common inputs read field
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 <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/main/state.h')
| -rw-r--r-- | src/mesa/main/state.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |