st/mesa/glsl/i965: move per stage UniformBlocks to gl_program

[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 a9ec19581c68ab040f0cfadcc3a0ff0077c61d89..45bb885359922787b6a25c178007ac78903ee78d 100644 (file)
--- a/src/mesa/state_tracker/st_atom_constbuf.c
+++ b/src/mesa/state_tracker/st_atom_constbuf.c
@@ -34,7 +34,7 @@
 #include "main/imports.h"
 #include "program/prog_parameter.h"
 #include "program/prog_print.h"
-
+#include "main/shaderapi.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
@@ -55,8 +55,10 @@
  */
 void st_upload_constants( struct st_context *st,
                           struct gl_program_parameter_list *params,
-                          unsigned shader_type)
+                          gl_shader_stage stage)
 {
+   enum pipe_shader_type shader_type = st_shader_stage_to_ptarget(stage);
+
    assert(shader_type == PIPE_SHADER_VERTEX ||
           shader_type == PIPE_SHADER_FRAGMENT ||
           shader_type == PIPE_SHADER_GEOMETRY ||
@@ -92,6 +94,8 @@ void st_upload_constants( struct st_context *st,
       if (params->StateFlags)
          _mesa_load_state_parameters(st->ctx, params);
 
+      _mesa_shader_write_subroutine_indices(st->ctx, stage);
+
       /* We always need to get a new buffer, to keep the drivers simple and
        * avoid gratuitous rendering synchronization.
        * Let's use a user buffer to avoid an unnecessary copy.
@@ -138,17 +142,13 @@ void st_upload_constants( struct st_context *st,
 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;
+   struct gl_program_parameter_list *params = vp->Base.Parameters;
 
-   st_upload_constants( st, params, PIPE_SHADER_VERTEX );
+   st_upload_constants( st, params, MESA_SHADER_VERTEX );
 }
 
 
 const struct st_tracked_state st_update_vs_constants = {
-   {                                                   /* dirty */
-      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
-      ST_NEW_VERTEX_PROGRAM,                           /* st */
-   },
    update_vs_constants                                 /* update */
 };
 
@@ -160,17 +160,13 @@ const struct st_tracked_state st_update_vs_constants = {
 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;
+   struct gl_program_parameter_list *params = fp->Base.Parameters;
 
-   st_upload_constants( st, params, PIPE_SHADER_FRAGMENT );
+   st_upload_constants( st, params, MESA_SHADER_FRAGMENT );
 }
 
 
 const struct st_tracked_state st_update_fs_constants = {
-   {                                                   /* dirty */
-      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
-      ST_NEW_FRAGMENT_PROGRAM,                         /* st */
-   },
    update_fs_constants                                 /* update */
 };
 
@@ -182,16 +178,12 @@ static void update_gs_constants(struct st_context *st )
    struct gl_program_parameter_list *params;
 
    if (gp) {
-      params = gp->Base.Base.Parameters;
-      st_upload_constants( st, params, PIPE_SHADER_GEOMETRY );
+      params = gp->Base.Parameters;
+      st_upload_constants( st, params, MESA_SHADER_GEOMETRY );
    }
 }
 
 const struct st_tracked_state st_update_gs_constants = {
-   {                                                   /* dirty */
-      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
-      ST_NEW_GEOMETRY_PROGRAM,                         /* st */
-   },
    update_gs_constants                                 /* update */
 };
 
@@ -203,16 +195,12 @@ static void update_tcs_constants(struct st_context *st )
    struct gl_program_parameter_list *params;
 
    if (tcp) {
-      params = tcp->Base.Base.Parameters;
-      st_upload_constants( st, params, PIPE_SHADER_TESS_CTRL );
+      params = tcp->Base.Parameters;
+      st_upload_constants( st, params, MESA_SHADER_TESS_CTRL );
    }
 }
 
 const struct st_tracked_state st_update_tcs_constants = {
-   {                                                   /* dirty */
-      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
-      ST_NEW_TESSCTRL_PROGRAM,                         /* st */
-   },
    update_tcs_constants                                        /* update */
 };
 
@@ -224,16 +212,12 @@ static void update_tes_constants(struct st_context *st )
    struct gl_program_parameter_list *params;
 
    if (tep) {
-      params = tep->Base.Base.Parameters;
-      st_upload_constants( st, params, PIPE_SHADER_TESS_EVAL );
+      params = tep->Base.Parameters;
+      st_upload_constants( st, params, MESA_SHADER_TESS_EVAL );
    }
 }
 
 const struct st_tracked_state st_update_tes_constants = {
-   {                                                   /* dirty */
-      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
-      ST_NEW_TESSEVAL_PROGRAM,                         /* st */
-   },
    update_tes_constants                                        /* update */
 };
 
@@ -245,16 +229,12 @@ static void update_cs_constants(struct st_context *st )
    struct gl_program_parameter_list *params;
 
    if (cp) {
-      params = cp->Base.Base.Parameters;
-      st_upload_constants( st, params, PIPE_SHADER_COMPUTE );
+      params = cp->Base.Parameters;
+      st_upload_constants( st, params, MESA_SHADER_COMPUTE );
    }
 }
 
 const struct st_tracked_state st_update_cs_constants = {
-   {                                                   /* dirty */
-      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
-      ST_NEW_COMPUTE_PROGRAM,                          /* st */
-   },
    update_cs_constants                                 /* update */
 };
 
@@ -268,11 +248,11 @@ static void st_bind_ubos(struct st_context *st,
    if (!shader)
       return;
 
-   for (i = 0; i < shader->NumUniformBlocks; i++) {
+   for (i = 0; i < shader->Program->info.num_ubos; i++) {
       struct gl_uniform_buffer_binding *binding;
       struct st_buffer_object *st_obj;
 
-      binding = &st->ctx->UniformBufferBindings[shader->UniformBlocks[i]->Binding];
+      binding = &st->ctx->UniformBufferBindings[shader->Program->sh.UniformBlocks[i]->Binding];
       st_obj = st_buffer_object(binding->BufferObject);
 
       cb.buffer = st_obj->buffer;
@@ -308,10 +288,6 @@ static void bind_vs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_vs_ubos = {
-   {
-      0,
-      ST_NEW_VERTEX_PROGRAM | ST_NEW_UNIFORM_BUFFER,
-   },
    bind_vs_ubos
 };
 
@@ -327,10 +303,6 @@ static void bind_fs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_fs_ubos = {
-   {
-      0,
-      ST_NEW_FRAGMENT_PROGRAM | ST_NEW_UNIFORM_BUFFER,
-   },
    bind_fs_ubos
 };
 
@@ -346,10 +318,6 @@ static void bind_gs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_gs_ubos = {
-   {
-      0,
-      ST_NEW_GEOMETRY_PROGRAM | ST_NEW_UNIFORM_BUFFER,
-   },
    bind_gs_ubos
 };
 
@@ -365,10 +333,6 @@ static void bind_tcs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tcs_ubos = {
-   {
-      0,
-      ST_NEW_TESSCTRL_PROGRAM | ST_NEW_UNIFORM_BUFFER,
-   },
    bind_tcs_ubos
 };
 
@@ -384,10 +348,6 @@ static void bind_tes_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tes_ubos = {
-   {
-      0,
-      ST_NEW_TESSEVAL_PROGRAM | ST_NEW_UNIFORM_BUFFER,
-   },
    bind_tes_ubos
 };
 
@@ -404,9 +364,5 @@ static void bind_cs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_cs_ubos = {
-   {
-      0,
-      ST_NEW_COMPUTE_PROGRAM | ST_NEW_UNIFORM_BUFFER,
-   },
    bind_cs_ubos
 };