diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-10-20 14:24:03 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-10-26 14:29:36 +1100 |
| commit | e81aaeba37f5419323d8f88bc10943c77e25ed14 (patch) | |
| tree | 3dc9c65fd0984128fb559aa71ed4ae4c7493995e /src/mesa/tnl | |
| 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 <marek.olsak@amd.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_context.c | 6 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_program.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 9b7982e854e..0319e855872 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -148,7 +148,7 @@ _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state ) */ tnl->render_inputs_bitset = BITFIELD64_BIT(_TNL_ATTRIB_POS); - if (!fp || (fp->InputsRead & VARYING_BIT_COL0)) { + if (!fp || (fp->info.inputs_read & VARYING_BIT_COL0)) { tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_COLOR0); } @@ -157,13 +157,13 @@ _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state ) for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) { if (ctx->Texture._EnabledCoordUnits & (1 << i) || - (fp && fp->InputsRead & VARYING_BIT_TEX(i))) { + (fp && fp->info.inputs_read & VARYING_BIT_TEX(i))) { tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_TEX(i)); } } if (ctx->Fog.Enabled - || (fp != NULL && (fp->InputsRead & VARYING_BIT_FOGC) != 0)) { + || (fp != NULL && (fp->info.inputs_read & VARYING_BIT_FOGC) != 0)) { /* Either fixed-function fog or a fragment program needs fog coord. */ tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_FOG); diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c index c0a48a0c565..1ed087c0fee 100644 --- a/src/mesa/tnl/t_vb_program.c +++ b/src/mesa/tnl/t_vb_program.c @@ -347,7 +347,7 @@ run_vp( struct gl_context *ctx, struct tnl_pipeline_stage *stage ) /* the vertex array case */ for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) { - if (program->InputsRead & BITFIELD64_BIT(attr)) { + if (program->info.inputs_read & BITFIELD64_BIT(attr)) { const GLubyte *ptr = (const GLubyte*) VB->AttribPtr[attr]->data; const GLuint size = VB->AttribPtr[attr]->size; const GLuint stride = VB->AttribPtr[attr]->stride; |