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/state_tracker | |
| 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/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_xformfb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_cb_xformfb.c b/src/mesa/state_tracker/st_cb_xformfb.c index bbc9e03dd07..4be9a7f659e 100644 --- a/src/mesa/state_tracker/st_cb_xformfb.c +++ b/src/mesa/state_tracker/st_cb_xformfb.c @@ -124,8 +124,8 @@ st_begin_transform_feedback(struct gl_context *ctx, GLenum mode, struct st_buffer_object *bo = st_buffer_object(sobj->base.Buffers[i]); if (bo && bo->buffer) { - unsigned stream = obj->shader_program->xfb_program-> - sh.LinkedTransformFeedback->Buffers[i].Stream; + unsigned stream = obj->program->sh.LinkedTransformFeedback-> + Buffers[i].Stream; /* Check whether we need to recreate the target. */ if (!sobj->targets[i] || @@ -203,8 +203,8 @@ st_end_transform_feedback(struct gl_context *ctx, pipe_so_target_reference(&sobj->draw_count[i], NULL); for (i = 0; i < ARRAY_SIZE(sobj->targets); i++) { - unsigned stream = obj->shader_program->xfb_program-> - sh.LinkedTransformFeedback->Buffers[i].Stream; + unsigned stream = obj->program->sh.LinkedTransformFeedback-> + Buffers[i].Stream; /* Is it not bound or already set for this stream? */ if (!sobj->targets[i] || sobj->draw_count[stream]) |