diff options
| author | Gregory Hainaut <[email protected]> | 2013-05-03 19:44:10 +0200 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2014-03-25 10:25:25 -0700 |
| commit | c03477050a6f51e601f75cb3c061a3e16a5b7171 (patch) | |
| tree | a39b3a0ad845e232612a6dbb305083e585f643bb /src/mesa/drivers/dri/i965/brw_wm.c | |
| parent | b2bddaf7a000bf9830a7947b18d8e31fb25353ae (diff) | |
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 <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 0d0d6ec82ff..b97501c5d19 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -579,7 +579,7 @@ brw_upload_wm_prog(struct brw_context *brw) if (!brw_search_cache(&brw->cache, BRW_WM_PROG, &key, sizeof(key), &brw->wm.base.prog_offset, &brw->wm.prog_data)) { - bool success = do_wm_prog(brw, ctx->Shader._CurrentFragmentProgram, fp, + bool success = do_wm_prog(brw, ctx->_Shader->_CurrentFragmentProgram, fp, &key); (void) success; assert(success); |