aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main/transformfeedback.c
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-11-20 21:44:29 +1100
committerTimothy Arceri <[email protected]>2017-01-23 14:48:04 +1100
commitf86d15ed94df59e4b3cdb4099d69cdd81f52fc27 (patch)
tree5d6f13c0b405bb2ee1e79b6ed6142794cd4a6af4 /src/mesa/main/transformfeedback.c
parentc505d6d852220f4aaaee161465dd2c579647e672 (diff)
st/mesa/glsl: change xfb_program field to last_vert_prog
Now that the i965 backend doesn't depend on this field we can make it more generic and short circuit a bunch of code paths. The new field will be used in a following patch for another clean-up. Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/main/transformfeedback.c')
-rw-r--r--src/mesa/main/transformfeedback.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index 06fa56ab993..96f3df1c961 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -65,9 +65,12 @@ bool
_mesa_transform_feedback_is_using_program(struct gl_context *ctx,
struct gl_shader_program *shProg)
{
+ if (!shProg->last_vert_prog)
+ return false;
+
struct using_program_tuple callback_data;
callback_data.found = false;
- callback_data.prog = shProg->xfb_program;
+ callback_data.prog = shProg->last_vert_prog;
_mesa_HashWalk(ctx->TransformFeedback.Objects,
active_xfb_object_references_program, &callback_data);