projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: make _CurrentFragmentProgram a gl_program struct pointer
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_wm_surface_state.c
diff --git
a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index eff19de06c0c689a1d66278b22b0233cf564f0bf..4566696fa98dafda8da740770422174476b03ad6 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@
-1438,14
+1438,10
@@
brw_upload_wm_ubo_surfaces(struct brw_context *brw)
{
struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */
{
struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */
- struct gl_shader_program *prog = ctx->_Shader->_CurrentFragmentProgram;
-
- if (!prog || !prog->_LinkedShaders[MESA_SHADER_FRAGMENT])
- return;
+ struct gl_program *prog = ctx->_Shader->_CurrentFragmentProgram;
/* BRW_NEW_FS_PROG_DATA */
/* BRW_NEW_FS_PROG_DATA */
- brw_upload_ubo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program,
- &brw->wm.base, brw->wm.base.prog_data);
+ brw_upload_ubo_surfaces(brw, prog, &brw->wm.base, brw->wm.base.prog_data);
}
const struct brw_tracked_state brw_wm_ubo_surfaces = {
}
const struct brw_tracked_state brw_wm_ubo_surfaces = {