diff options
author | Kenneth Graunke <[email protected]> | 2013-09-06 14:47:19 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2013-09-12 10:19:07 -0700 |
commit | c732f68cf4aca06bac03e6a70c49047057c0c357 (patch) | |
tree | c79471c136aa12cf6cfc14da7e053d8dfc5bb098 | |
parent | a7d616da69d631cc088c01b761a8b1b8b36c6b13 (diff) |
mesa: Track the vertex program active at BeginTransformFeedback() time.
The next few patches will use this for API error checking.
All of the drivers appear to CALLOC_STRUCT transform feedback objects,
so this should be properly NULL initialized on creation.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
-rw-r--r-- | src/mesa/main/mtypes.h | 6 | ||||
-rw-r--r-- | src/mesa/main/transformfeedback.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 9df165403bd..b9625e8e72b 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1718,6 +1718,12 @@ struct gl_transform_feedback_object GLboolean EverBound; /**< Has this object been bound? */ /** + * The shader program active when BeginTransformFeedback() was called. + * When active and unpaused, this equals ctx->Shader.CurrentVertexProgram. + */ + struct gl_shader_program *shader_program; + + /** * GLES: if Active is true, remaining number of primitives which can be * rendered without overflow. This is necessary to track because GLES * requires us to generate INVALID_OPERATION if a call to glDrawArrays or diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c index eca0e5f55c9..c2c14a1d339 100644 --- a/src/mesa/main/transformfeedback.c +++ b/src/mesa/main/transformfeedback.c @@ -406,6 +406,8 @@ _mesa_BeginTransformFeedback(GLenum mode) obj->GlesRemainingPrims = max_vertices / vertices_per_prim; } + obj->shader_program = ctx->Shader.CurrentVertexProgram; + assert(ctx->Driver.BeginTransformFeedback); ctx->Driver.BeginTransformFeedback(ctx, mode, obj); } |