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_gs_surface_state.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_gs_surface_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_gs_surface_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c index 0795e56580e..26a3fa89e39 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c @@ -70,7 +70,7 @@ brw_upload_gs_ubo_surfaces(struct brw_context *brw) /* _NEW_PROGRAM */ struct gl_shader_program *prog = - ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY]; + ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY]; if (!prog) return; @@ -95,7 +95,7 @@ brw_upload_gs_abo_surfaces(struct brw_context *brw) struct gl_context *ctx = &brw->ctx; /* _NEW_PROGRAM */ struct gl_shader_program *prog = - ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY]; + ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY]; if (prog) { /* CACHE_NEW_GS_PROG */ |