diff options
author | Gregory Hainaut <gregory.hainaut@gmail.com> | 2013-05-03 19:44:10 +0200 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-03-25 10:25:25 -0700 |
commit | c03477050a6f51e601f75cb3c061a3e16a5b7171 (patch) | |
tree | a39b3a0ad845e232612a6dbb305083e585f643bb /src/mesa/drivers/dri/i965/gen6_sol.c | |
parent | b2bddaf7a000bf9830a7947b18d8e31fb25353ae (diff) | |
download | external_mesa3d-c03477050a6f51e601f75cb3c061a3e16a5b7171.zip external_mesa3d-c03477050a6f51e601f75cb3c061a3e16a5b7171.tar.gz external_mesa3d-c03477050a6f51e601f75cb3c061a3e16a5b7171.tar.bz2 |
mesa/sso: rename Shader to the pointer _Shader
Basically a sed but shaderapi.c and get.c.
get.c => GL_CURRENT_PROGAM always refer to the "old" UseProgram behavior
shaderapi.c => the old api stil update the Shader object directly
V2: formatting improvement
V3 (idr):
* Rebase fixes after a block of code was moved from ir_to_mesa.cpp to
shaderapi.c.
* Trivial reformatting.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_sol.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/gen6_sol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c b/src/mesa/drivers/dri/i965/gen6_sol.c index 0047c8a..e1c1b3c 100644 --- a/src/mesa/drivers/dri/i965/gen6_sol.c +++ b/src/mesa/drivers/dri/i965/gen6_sol.c @@ -43,7 +43,7 @@ gen6_update_sol_surfaces(struct brw_context *brw) ctx->TransformFeedback.CurrentObject; /* BRW_NEW_VERTEX_PROGRAM */ const struct gl_shader_program *shaderprog = - ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; + ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]; const struct gl_transform_feedback_info *linked_xfb_info = &shaderprog->LinkedTransformFeedback; int i; @@ -89,7 +89,7 @@ brw_gs_upload_binding_table(struct brw_context *brw) struct gl_context *ctx = &brw->ctx; /* BRW_NEW_VERTEX_PROGRAM */ const struct gl_shader_program *shaderprog = - ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; + ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]; bool has_surfaces = false; uint32_t *bind; @@ -175,7 +175,7 @@ brw_begin_transform_feedback(struct gl_context *ctx, GLenum mode, { struct brw_context *brw = brw_context(ctx); const struct gl_shader_program *vs_prog = - ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; + ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]; const struct gl_transform_feedback_info *linked_xfb_info = &vs_prog->LinkedTransformFeedback; struct gl_transform_feedback_object *xfb_obj = |