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]> --- src/mesa/main/mtypes.h | 6 ++++++ src/mesa/main/transformfeedback.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index ef16c59..0d89fd5 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 eca0e5f..c2c14a1 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); } -- 1.8.3.4 _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
