From de653b4c9bddcec46f3ddf411ec082dd178d7b38 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 16 Aug 2007 13:33:43 -0600
Subject: Begin added vertex shader state/support.

Renamed pipe_fs_state to pipe_shader_state since it can be used for both
vertex and fragment shader info.
---
 src/mesa/state_tracker/st_atom_fs.c       | 83 ++++++++++++++++++++++++++++++-
 src/mesa/state_tracker/st_cb_clear.c      |  2 +-
 src/mesa/state_tracker/st_cb_drawpixels.c |  2 +-
 src/mesa/state_tracker/st_context.h       |  3 +-
 src/mesa/state_tracker/st_program.h       |  2 +
 5 files changed, 88 insertions(+), 4 deletions(-)

(limited to 'src/mesa/state_tracker')

diff --git a/src/mesa/state_tracker/st_atom_fs.c b/src/mesa/state_tracker/st_atom_fs.c
index 58875de3f9..9731ab6cee 100644
--- a/src/mesa/state_tracker/st_atom_fs.c
+++ b/src/mesa/state_tracker/st_atom_fs.c
@@ -39,6 +39,11 @@
 
 #define TGSI_DEBUG 0
 
+
+/**
+ ** Fragment programs
+ **/
+
 static void compile_fs( struct st_context *st,
 			struct st_fragment_program *fs )
 {
@@ -53,7 +58,7 @@ static void compile_fs( struct st_context *st,
 
 static void update_fs( struct st_context *st )
 {
-   struct pipe_fs_state fs;
+   struct pipe_shader_state fs;
    struct st_fragment_program *fp = NULL;
    struct gl_program_parameter_list *params = NULL;
 
@@ -103,3 +108,79 @@ const struct st_tracked_state st_update_fs = {
    },
    .update = update_fs
 };
+
+
+
+/**
+ ** Vertex programs
+ **/
+
+
+static void compile_vs( struct st_context *st,
+			struct st_vertex_program *vs )
+{
+   /* XXX: fix static allocation of tokens:
+    */
+   tgsi_mesa_compile_vp_program( &vs->Base, vs->tokens, ST_FP_MAX_TOKENS );
+
+   if (TGSI_DEBUG)
+      tgsi_dump( vs->tokens, TGSI_DUMP_VERBOSE );
+}
+
+
+static void update_vs( struct st_context *st )
+{
+   struct pipe_shader_state vs;
+   struct st_vertex_program *vp = NULL;
+   struct gl_program_parameter_list *params = NULL;
+
+   if (st->ctx->Shader.CurrentProgram &&
+       st->ctx->Shader.CurrentProgram->LinkStatus &&
+       st->ctx->Shader.CurrentProgram->VertexProgram) {
+      struct gl_vertex_program *f
+         = st->ctx->Shader.CurrentProgram->VertexProgram;
+      vp = st_vertex_program(f);
+      params = f->Base.Parameters;
+   }
+   else if (st->ctx->VertexProgram._Current) {
+      vp = st_vertex_program(st->ctx->VertexProgram._Current);
+      params = st->ctx->VertexProgram._Current->Base.Parameters;
+   }
+
+   /* XXXX temp */
+   if (!vp)
+      return;
+
+   if (vp && params) {
+      /* load program's constants array */
+      vp->constants.nr_constants = params->NumParameters;
+      memcpy(vp->constants.constant, 
+             params->ParameterValues,
+             params->NumParameters * sizeof(GLfloat) * 4);
+   }
+
+   if (vp->dirty)
+      compile_vs( st, vp );
+
+   memset( &vs, 0, sizeof(vs) );
+   vs.inputs_read = vp->Base.Base.InputsRead;
+   vs.tokens = &vp->tokens[0];
+   vs.constants = &vp->constants;
+   
+   if (memcmp(&vs, &st->state.vs, sizeof(vs)) != 0 ||
+       vp->dirty) 
+   {
+      vp->dirty = 0;
+      st->state.vs = vs;
+      st->pipe->set_vs_state(st->pipe, &vs);
+   }
+}
+
+
+const struct st_tracked_state st_update_vs = {
+   .dirty = {
+      .mesa  = _NEW_PROGRAM,
+      .st   = ST_NEW_VERTEX_PROGRAM,
+   },
+   .update = update_vs
+};
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index 2f7ade73e4..3777c53d48 100644
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -278,7 +278,7 @@ clear_with_quad(GLcontext *ctx,
    /* fragment shader state: color pass-through program */
    {
       static struct st_fragment_program *stfp = NULL;
-      struct pipe_fs_state fs;
+      struct pipe_shader_state fs;
       if (!stfp) {
          stfp = make_color_shader(st);
       }
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index dd27760a58..11261f1d99 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -272,7 +272,7 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
    /* fragment shader state: color pass-through program */
    {
       static struct st_fragment_program *stfp = NULL;
-      struct pipe_fs_state fs;
+      struct pipe_shader_state fs;
       if (!stfp) {
          stfp = make_drawpixels_shader(ctx->st);
       }
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 13843d9b7f..25ed20a5f8 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -73,7 +73,8 @@ struct st_context
       struct pipe_clip_state clip;
       struct pipe_depth_state depth;
       struct pipe_framebuffer_state framebuffer;
-      struct pipe_fs_state     fs;
+      struct pipe_shader_state fs;
+      struct pipe_shader_state vs;
       struct pipe_poly_stipple poly_stipple;
       struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
       struct pipe_scissor_state scissor;
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index 8dcb2ceb48..b077fdf069 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -83,7 +83,9 @@ struct st_vertex_program
 				 * ProgramStringNotify changes.
 				 */
 
+   struct tgsi_token tokens[ST_FP_MAX_TOKENS];
    GLboolean dirty;
+   struct pipe_constant_buffer constants;
    GLuint param_state;
 };
 
-- 
cgit v1.2.3