diff options
| author | Timothy Arceri <[email protected]> | 2016-11-03 16:00:37 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-12-30 10:57:16 +1100 |
| commit | 700bc94dcebf4257740483d2ba467b138234fa1a (patch) | |
| tree | da45fbee155479d7692bbe68c534a3c1c67385b3 /src/mesa/drivers/dri/i965/gen7_sol_state.c | |
| parent | 31c04e4e229bec4e059779b4034cf597ceeadf97 (diff) | |
mesa/glsl: move LinkedTransformFeedback from gl_shader_program to gl_program
This will help allow us to store gl_program in the CurrentProgram array rather
than gl_shader_program which will allow a bunch of simplifications.
Note that we make LinkedTransformFeedback a pointer so we don't waste
memory creating a struct for each stage. We also store a pointer to
the gl_program that will contain the pointer in gl_shader_program so
we can get easy access to the correct stage.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_sol_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_sol_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c index 17752742d46..5170f6a16ea 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->LinkedTransformFeedback; + xfb_obj->shader_program->xfb_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->LinkedTransformFeedback; + xfb_obj->shader_program->xfb_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->LinkedTransformFeedback; + xfb_obj->shader_program->xfb_program->sh.LinkedTransformFeedback; uint32_t dw1 = 0, dw2 = 0, dw3 = 0, dw4 = 0; int i; |