gallium: Use MALLOC().

[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 c2310f9d3f3841e2cef75a0f385e6686a0a5eede..21416da2e012c702338adca6cd67a1134532c95f 100644 (file)
--- a/src/mesa/state_tracker/st_atom_constbuf.c
+++ b/src/mesa/state_tracker/st_atom_constbuf.c
@@ -32,22 +32,33 @@
 
 #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"
 
-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_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;
@@ -59,26 +70,27 @@ static void upload_constants( struct st_context *st,
 
       _mesa_load_state_parameters(st->ctx, params);
 
-      if (!cbuf->buffer)   
-        cbuf->buffer = ws->buffer_create(ws, 1);
+      if (cbuf->buffer && cbuf->size != paramBytes)
+        pipe_buffer_reference( ws, &cbuf->buffer, NULL );
+
+      if (!cbuf->buffer) {
+         cbuf->buffer = ws->buffer_create(ws, 1, 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);
+      if (cbuf->buffer) {
+         memcpy(ws->buffer_map(ws, cbuf->buffer, PIPE_BUFFER_USAGE_CPU_WRITE),
+                params->ParameterValues, paramBytes);
+         ws->buffer_unmap(ws, cbuf->buffer);
+      }
 
       cbuf->size = paramBytes;
 
@@ -97,7 +109,7 @@ 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 = {
@@ -116,7 +128,7 @@ 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 = {