intel / DRI2: When available, use DRI2GetBuffersWithFormat

[mesa.git] / src / mesa / state_tracker / st_atom_constbuf.c

diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c
index 7bea9476f14fb4abfaebaad992fad71bceb3a65d..3ba7b2692856bda0defeadf6736a7a1d869b98c6 100644 (file)
--- a/src/mesa/state_tracker/st_atom_constbuf.c
+++ b/src/mesa/state_tracker/st_atom_constbuf.c
@@ -30,56 +30,59 @@
   *   Brian Paul
   */
 
+#include "main/imports.h"
 #include "shader/prog_parameter.h"
+#include "shader/prog_print.h"
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_winsys.h"
+#include "pipe/p_inlines.h"
 
 #include "st_context.h"
 #include "st_atom.h"
+#include "st_atom_constbuf.h"
 #include "st_program.h"
+#include "st_inlines.h"
 
-static void upload_constants( struct st_context *st,
-                             struct gl_program_parameter_list *params,
-                             unsigned id)
+/**
+ * Pass the given program parameters to the graphics pipe as a
+ * constant buffer.
+ * \param id  either PIPE_SHADER_VERTEX or PIPE_SHADER_FRAGMENT
+ */
+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);
+
    /* update constants */
    if (params && params->NumParameters) {
       const uint paramBytes = params->NumParameters * sizeof(GLfloat) * 4;
 
-      /* Update our own dependency flags.  This works because this
-       * function will also be called whenever the program changes.
-       */
-      st->constants.tracked_state[id].dirty.mesa = params->StateFlags;
-
       _mesa_load_state_parameters(st->ctx, params);
 
-      if (!cbuf->buffer)   
-        cbuf->buffer = ws->buffer_create(ws, 1);
+      /* We always need to get a new buffer, to keep the drivers simple and
+       * avoid gratuitous rendering synchronization.
+       */
+      pipe_buffer_reference(&cbuf->buffer, NULL );
+      cbuf->buffer = pipe_buffer_create(pipe->screen, 16, PIPE_BUFFER_USAGE_CONSTANT,
+                                       paramBytes );
 
       if (0)
       {
-        int i;
-
-        _mesa_printf("%s(%d): %d / %x\n", 
-                     __FUNCTION__, id, params->NumParameters, params->StateFlags);
-
-        for (i = 0; i < params->NumParameters; i++)
-           fprintf(stderr, "%d: %f %f %f %f\n", i,
-                   params->ParameterValues[i][0],
-                   params->ParameterValues[i][1],
-                   params->ParameterValues[i][2],
-                   params->ParameterValues[i][3]);
+        printf("%s(shader=%d, numParams=%d, stateFlags=0x%x)\n", 
+                __FUNCTION__, id, params->NumParameters, params->StateFlags);
+         _mesa_print_parameter_list(params);
       }
 
       /* load Mesa constants into the constant buffer */
-      ws->buffer_data(ws, cbuf->buffer, paramBytes, params->ParameterValues);
-
-      cbuf->size = paramBytes;
+      if (cbuf->buffer)
+         st_no_flush_pipe_buffer_write(st, cbuf->buffer,
+                                      0, paramBytes,
+                                      params->ParameterValues);
 
       st->pipe->set_constant_buffer(st->pipe, id, 0, cbuf);
    }
@@ -96,16 +99,16 @@ static void update_vs_constants(struct st_context *st )
    struct st_vertex_program *vp = st->vp;
    struct gl_program_parameter_list *params = vp->Base.Base.Parameters;
 
-   upload_constants( st, params, PIPE_SHADER_VERTEX );
+   st_upload_constants( st, params, PIPE_SHADER_VERTEX );
 }
 
 const struct st_tracked_state st_update_vs_constants = {
-   .name = "st_update_vs_constants",
-   .dirty = {
-      .mesa  = 0, 
-      .st   = ST_NEW_VERTEX_PROGRAM,
+   "st_update_vs_constants",                           /* name */
+   {                                                   /* dirty */
+      (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS),          /* mesa */
+      ST_NEW_VERTEX_PROGRAM,                           /* st */
    },
-   .update = update_vs_constants
+   update_vs_constants                                 /* update */
 };
 
 /* Fragment shader:
@@ -115,15 +118,15 @@ static void update_fs_constants(struct st_context *st )
    struct st_fragment_program *fp = st->fp;
    struct gl_program_parameter_list *params = fp->Base.Base.Parameters;
 
-   upload_constants( st, params, PIPE_SHADER_FRAGMENT );
+   st_upload_constants( st, params, PIPE_SHADER_FRAGMENT );
 }
 
 const struct st_tracked_state st_update_fs_constants = {
-   .name = "st_update_fs_constants",
-   .dirty = {
-      .mesa  = 0, 
-      .st   = ST_NEW_FRAGMENT_PROGRAM,
+   "st_update_fs_constants",                           /* name */
+   {                                                   /* dirty */
+      (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS),          /* mesa */
+      ST_NEW_FRAGMENT_PROGRAM,                         /* st */
    },
-   .update = update_fs_constants
+   update_fs_constants                                 /* update */
 };