Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

1 files changed, 17 insertions, 17 deletions

diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c
index 03093579e1..2856e0f0e0 100644
--- a/src/mesa/state_tracker/st_atom_constbuf.c
+++ b/src/mesa/state_tracker/st_atom_constbuf.c
@@ -36,7 +36,6 @@
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
 
 #include "st_context.h"
@@ -54,7 +53,7 @@ void st_upload_constants( struct st_context *st,
                           struct gl_program_parameter_list *params,
                           unsigned id)
 {
-   struct pipe_winsys *ws = st->pipe->winsys;
+   struct pipe_context *pipe = st->pipe;
    struct pipe_constant_buffer *cbuf = &st->state.constants[id];
 
    assert(id == PIPE_SHADER_VERTEX || id == PIPE_SHADER_FRAGMENT);
@@ -74,8 +73,8 @@ void st_upload_constants( struct st_context *st,
       /* We always need to get a new buffer, to keep the drivers simple and
        * avoid gratuitous rendering synchronization.
        */
-      pipe_buffer_reference( ws, &cbuf->buffer, NULL );
-      cbuf->buffer = ws->buffer_create( ws, 1, PIPE_BUFFER_USAGE_CONSTANT,
+      pipe_reference_buffer(pipe, &cbuf->buffer, NULL );
+      cbuf->buffer = pipe_buffer_create(pipe, 1, PIPE_BUFFER_USAGE_CONSTANT,
 					paramBytes );
 
       if (0)
@@ -87,9 +86,10 @@ void st_upload_constants( struct st_context *st,
 
       /* load Mesa constants into the constant buffer */
       if (cbuf->buffer) {
-         memcpy(ws->buffer_map(ws, cbuf->buffer, PIPE_BUFFER_USAGE_CPU_WRITE),
-                params->ParameterValues, paramBytes);
-         ws->buffer_unmap(ws, cbuf->buffer);
+         void *map = pipe_buffer_map(pipe, cbuf->buffer,
+                                     PIPE_BUFFER_USAGE_CPU_WRITE);
+         memcpy(map, params->ParameterValues, paramBytes);
+         pipe_buffer_unmap(pipe, cbuf->buffer);
       }
 
       cbuf->size = paramBytes;
@@ -113,12 +113,12 @@ static void update_vs_constants(struct st_context *st )
 }
 
 const struct st_tracked_state st_update_vs_constants = {
-   .name = "st_update_vs_constants",
-   .dirty = {
-      .mesa  = 0,  /* set dynamically above */
-      .st   = ST_NEW_VERTEX_PROGRAM,
+   "st_update_vs_constants",				/* name */
+   {							/* dirty */
+      0,  /* set dynamically above */			/* mesa */
+      ST_NEW_VERTEX_PROGRAM,				/* st */
    },
-   .update = update_vs_constants
+   update_vs_constants					/* update */
 };
 
 /* Fragment shader:
@@ -132,11 +132,11 @@ static void update_fs_constants(struct st_context *st )
 }
 
 const struct st_tracked_state st_update_fs_constants = {
-   .name = "st_update_fs_constants",
-   .dirty = {
-      .mesa  = 0,  /* set dynamically above */
-      .st   = ST_NEW_FRAGMENT_PROGRAM,
+   "st_update_fs_constants",				/* name */
+   {							/* dirty */
+      0,  /* set dynamically above */			/* mesa */
+      ST_NEW_FRAGMENT_PROGRAM,				/* st */
    },
-   .update = update_fs_constants
+   update_fs_constants					/* update */
 };