summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-05-24 14:37:00 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-05-24 14:37:00 -0600
commit3bf0fd60905d18cc6fef7845d68e0c5b530f531b (patch)
treed44d975afc4b5ffc2210b86e9ab55d21b58fdd73 /src/mesa
parent711af67fe4afa7d982649c101d68474be9294e07 (diff)
add scissor state
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/softpipe/state_tracker/st_atom.c9
-rw-r--r--src/mesa/softpipe/state_tracker/st_atom.h1
2 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/softpipe/state_tracker/st_atom.c b/src/mesa/softpipe/state_tracker/st_atom.c
index 99fba398bf..1eb5c86e46 100644
--- a/src/mesa/softpipe/state_tracker/st_atom.c
+++ b/src/mesa/softpipe/state_tracker/st_atom.c
@@ -47,6 +47,7 @@ static const struct st_tracked_state *atoms[] =
&st_update_fs,
&st_update_setup,
&st_update_viewport,
+ &st_update_scissor,
/* will be patched out at runtime */
/* &st_update_constants */
};
@@ -58,7 +59,7 @@ void st_init_atoms( struct st_context *st )
st->atoms = _mesa_malloc(sizeof(atoms));
st->nr_atoms = sizeof(atoms)/sizeof(*atoms);
- _mesa_memcpy(st->atoms, atoms, sizeof(atoms));
+ memcpy(st->atoms, atoms, sizeof(atoms));
/* Patch in a pointer to the dynamic state atom:
*/
@@ -66,9 +67,9 @@ void st_init_atoms( struct st_context *st )
if (st->atoms[i] == &st_update_constants)
st->atoms[i] = &st->constants.tracked_state;
- _mesa_memcpy(&st->constants.tracked_state,
- &st_update_constants,
- sizeof(st_update_constants));
+ memcpy(&st->constants.tracked_state,
+ &st_update_constants,
+ sizeof(st_update_constants));
}
diff --git a/src/mesa/softpipe/state_tracker/st_atom.h b/src/mesa/softpipe/state_tracker/st_atom.h
index 87b72940b4..ee3d36a00c 100644
--- a/src/mesa/softpipe/state_tracker/st_atom.h
+++ b/src/mesa/softpipe/state_tracker/st_atom.h
@@ -50,6 +50,7 @@ const struct st_tracked_state st_update_fs;
const struct st_tracked_state st_update_setup;
const struct st_tracked_state st_update_viewport;
const struct st_tracked_state st_update_constants;
+const struct st_tracked_state st_update_scissor;
#endif