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/drivers/dri/i915/intel_tris.c | |
| 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/drivers/dri/i915/intel_tris.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_tris.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c index 683d5a679c9..36cba22780b 100644 --- a/src/mesa/drivers/dri/i915/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c @@ -436,7 +436,7 @@ intel_draw_point(struct intel_context *intel, intelVertexPtr v0) ***********************************************************************/ /* Currently not working - VERT_ATTRIB_POINTSIZE isn't correctly - * represented in the fragment program InputsRead field. + * represented in the fragment program info.inputs_read field. */ static void intel_atten_point(struct intel_context *intel, intelVertexPtr v0) @@ -956,7 +956,7 @@ intelChooseRenderState(struct gl_context * ctx) (ctx->Line.StippleFlag ? DD_LINE_STIPPLE : 0) | (ctx->Point._Attenuated ? DD_POINT_ATTEN : 0); const struct gl_program *fprog = ctx->FragmentProgram._Current; - bool have_wpos = (fprog && (fprog->InputsRead & VARYING_BIT_POS)); + bool have_wpos = (fprog && (fprog->info.inputs_read & VARYING_BIT_POS)); GLuint index = 0; if (INTEL_DEBUG & DEBUG_STATE) |