projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into gallium_draw_llvm
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_atom_clip.c
diff --git
a/src/mesa/state_tracker/st_atom_clip.c
b/src/mesa/state_tracker/st_atom_clip.c
index 8ccad637d5f83a26a7e56488bf4df106fa07c65a..80c0e921398396f62ecc5ae11af4d958900a667b 100644
(file)
--- a/
src/mesa/state_tracker/st_atom_clip.c
+++ b/
src/mesa/state_tracker/st_atom_clip.c
@@
-35,6
+35,8
@@
#include "pipe/p_context.h"
#include "st_atom.h"
#include "pipe/p_context.h"
#include "st_atom.h"
+#include "cso_cache/cso_context.h"
+
/* Second state atom for user clip planes:
*/
/* Second state atom for user clip planes:
*/
@@
-56,20
+58,16
@@
static void update_clip( struct st_context *st )
if (memcmp(&clip, &st->state.clip, sizeof(clip)) != 0) {
st->state.clip = clip;
if (memcmp(&clip, &st->state.clip, sizeof(clip)) != 0) {
st->state.clip = clip;
-
st->pipe->set_clip_state(st->pipe
, &clip);
+
cso_set_clip(st->cso_context
, &clip);
}
}
const struct st_tracked_state st_update_clip = {
}
}
const struct st_tracked_state st_update_clip = {
- .dirty = {
- .mesa = (_NEW_TRANSFORM),
- .st = 0,
+ "st_update_clip", /* name */
+ { /* dirty */
+ (_NEW_TRANSFORM), /* mesa */
+ 0, /* st */
},
},
- .update = update_clip
+ update_clip /* update */
};
};
-
-
-
-
-