add scissor state

diff --git a/src/mesa/softpipe/state_tracker/st_atom.c b/src/mesa/softpipe/state_tracker/st_atom.c
index 99fba398bfff1d65f1769810004c298989366bdf..1eb5c86e4691690b1e4cf889e570a5dcbf85af71 100644 (file)
--- 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 87b72940b4254b0311c2e47d14d4ccce94238a83..ee3d36a00ce8411a477f7fab71622bdd234124f5 100644 (file)
--- 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