diff options
| author | Timothy Arceri <[email protected]> | 2016-11-03 14:35:08 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-12-30 10:57:16 +1100 |
| commit | 3177eef39277b64af3213603b58ff934b5218e39 (patch) | |
| tree | 7471af703fe3298068df96476c6ec4a725104ba5 /src/mesa/drivers | |
| parent | 700bc94dcebf4257740483d2ba467b138234fa1a (diff) | |
mesa: store gl_program in gl_transform_feedback_object rather than gl_shader_program
This will allow us to make the CurrentProgram array store gl_program which allows
us to do a bunch of simplifications.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_sol.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_sol_state.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c b/src/mesa/drivers/dri/i965/gen6_sol.c index f6a183ad169..656d042769e 100644 --- a/src/mesa/drivers/dri/i965/gen6_sol.c +++ b/src/mesa/drivers/dri/i965/gen6_sol.c @@ -45,8 +45,7 @@ gen6_update_sol_surfaces(struct brw_context *brw) if (xfb_active) { /* BRW_NEW_TRANSFORM_FEEDBACK */ xfb_obj = ctx->TransformFeedback.CurrentObject; - linked_xfb_info = - xfb_obj->shader_program->xfb_program->sh.LinkedTransformFeedback; + linked_xfb_info = xfb_obj->program->sh.LinkedTransformFeedback; } for (int i = 0; i < BRW_MAX_SOL_BINDINGS; ++i) { diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c index 5170f6a16ea..c9f9f1f731d 100644 --- a/src/mesa/drivers/dri/i965/gen7_sol_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c @@ -43,7 +43,7 @@ upload_3dstate_so_buffers(struct brw_context *brw) struct gl_transform_feedback_object *xfb_obj = ctx->TransformFeedback.CurrentObject; const struct gl_transform_feedback_info *linked_xfb_info = - xfb_obj->shader_program->xfb_program->sh.LinkedTransformFeedback; + xfb_obj->program->sh.LinkedTransformFeedback; int i; /* Set up the up to 4 output buffers. These are the ranges defined in the @@ -103,7 +103,7 @@ gen7_upload_3dstate_so_decl_list(struct brw_context *brw, struct gl_transform_feedback_object *xfb_obj = ctx->TransformFeedback.CurrentObject; const struct gl_transform_feedback_info *linked_xfb_info = - xfb_obj->shader_program->xfb_program->sh.LinkedTransformFeedback; + xfb_obj->program->sh.LinkedTransformFeedback; uint16_t so_decl[MAX_VERTEX_STREAMS][128]; int buffer_mask[MAX_VERTEX_STREAMS] = {0, 0, 0, 0}; int next_offset[MAX_VERTEX_STREAMS] = {0, 0, 0, 0}; @@ -229,7 +229,7 @@ upload_3dstate_streamout(struct brw_context *brw, bool active, struct gl_transform_feedback_object *xfb_obj = ctx->TransformFeedback.CurrentObject; const struct gl_transform_feedback_info *linked_xfb_info = - xfb_obj->shader_program->xfb_program->sh.LinkedTransformFeedback; + xfb_obj->program->sh.LinkedTransformFeedback; uint32_t dw1 = 0, dw2 = 0, dw3 = 0, dw4 = 0; int i; |