summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-03-17 20:03:43 -0700
committerKenneth Graunke <[email protected]>2014-04-07 23:36:19 -0700
commitf68353c57c3847ab17b7e32ee98c313a14972d9b (patch)
tree13fae6886ffea02820d8fb7e11b343ef7bc9dca8 /src/mesa/drivers
parent47f60cbb7197bd9f8bb27ca3a2b160e8a563619a (diff)
i965: Use the correct program when uploading Broadwell SOL state.
This is the equivalent of commit 43e77215b13b2f86e461cd8a62b542f. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/gen8_sol_state.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/gen8_sol_state.c b/src/mesa/drivers/dri/i965/gen8_sol_state.c
index 35aa76606a9..42cd2fc1216 100644
--- a/src/mesa/drivers/dri/i965/gen8_sol_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_sol_state.c
@@ -101,14 +101,11 @@ gen8_upload_3dstate_streamout(struct brw_context *brw, bool active,
{
struct gl_context *ctx = &brw->ctx;
- /* BRW_NEW_VERTEX_PROGRAM */
- const struct gl_shader_program *vs_prog =
- ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX];
/* BRW_NEW_TRANSFORM_FEEDBACK */
- const struct gl_transform_feedback_info *linked_xfb_info =
- &vs_prog->LinkedTransformFeedback;
struct gl_transform_feedback_object *xfb_obj =
ctx->TransformFeedback.CurrentObject;
+ const struct gl_transform_feedback_info *linked_xfb_info =
+ &xfb_obj->shader_program->LinkedTransformFeedback;
uint32_t dw1 = 0, dw2 = 0, dw3 = 0, dw4 = 0;
if (active) {
@@ -172,7 +169,6 @@ const struct brw_tracked_state gen8_sol_state = {
.brw = BRW_NEW_BATCH |
BRW_NEW_RASTERIZER_DISCARD |
BRW_NEW_TRANSFORM_FEEDBACK |
- BRW_NEW_VERTEX_PROGRAM |
BRW_NEW_VUE_MAP_GEOM_OUT,
.cache = 0,
},