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/brw_vs.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/brw_vs.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index d98f195..e0f32b3 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -147,7 +147,7 @@ brw_compute_vue_map(struct brw_context *brw, struct brw_vue_map *vue_map, */ gl_clip_plane *brw_select_clip_planes(struct gl_context *ctx) { - if (ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]) { + if (ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]) { /* There is currently a GLSL vertex shader, so clip according to GLSL * rules, which means compare gl_ClipVertex (or gl_Position, if * gl_ClipVertex wasn't assigned) against the eye-coordinate clip planes @@ -484,7 +484,7 @@ static void brw_upload_vs_prog(struct brw_context *brw) &key, sizeof(key), &brw->vs.base.prog_offset, &brw->vs.prog_data)) { bool success = - do_vs_prog(brw, ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX], vp, + do_vs_prog(brw, ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX], vp, &key); (void) success; assert(success); |