summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/pipe/i915simple/i915_context.h2
-rw-r--r--src/mesa/pipe/i915simple/i915_state.c2
-rw-r--r--src/mesa/pipe/p_context.h5
-rw-r--r--src/mesa/pipe/p_state.h4
-rw-r--r--src/mesa/pipe/softpipe/sp_context.h4
-rw-r--r--src/mesa/pipe/softpipe/sp_state.h5
-rw-r--r--src/mesa/pipe/softpipe/sp_state_fs.c14
-rw-r--r--src/mesa/state_tracker/st_atom_fs.c83
-rw-r--r--src/mesa/state_tracker/st_cb_clear.c2
-rw-r--r--src/mesa/state_tracker/st_cb_drawpixels.c2
-rw-r--r--src/mesa/state_tracker/st_context.h3
-rw-r--r--src/mesa/state_tracker/st_program.h2
12 files changed, 111 insertions, 17 deletions
diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/mesa/pipe/i915simple/i915_context.h
index d69657daa9f..1e48485c568 100644
--- a/src/mesa/pipe/i915simple/i915_context.h
+++ b/src/mesa/pipe/i915simple/i915_context.h
@@ -105,7 +105,7 @@ struct i915_context
struct pipe_clip_state clip;
struct pipe_depth_state depth_test;
struct pipe_framebuffer_state framebuffer;
- struct pipe_fs_state fs;
+ struct pipe_shader_state fs;
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
diff --git a/src/mesa/pipe/i915simple/i915_state.c b/src/mesa/pipe/i915simple/i915_state.c
index f874b210160..06fa716c4fa 100644
--- a/src/mesa/pipe/i915simple/i915_state.c
+++ b/src/mesa/pipe/i915simple/i915_state.c
@@ -111,7 +111,7 @@ static void i915_set_polygon_stipple( struct pipe_context *pipe,
static void i915_set_fs_state( struct pipe_context *pipe,
- const struct pipe_fs_state *fs )
+ const struct pipe_shader_state *fs )
{
struct i915_context *i915 = i915_context(pipe);
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 6679aae089d..320b4877c3e 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -117,7 +117,10 @@ struct pipe_context {
const struct pipe_framebuffer_state * );
void (*set_fs_state)( struct pipe_context *,
- const struct pipe_fs_state * );
+ const struct pipe_shader_state * );
+
+ void (*set_vs_state)( struct pipe_context *,
+ const struct pipe_shader_state * );
void (*set_polygon_stipple)( struct pipe_context *,
const struct pipe_poly_stipple * );
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 4878cb41bdf..c1972c56b30 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -121,8 +121,8 @@ struct pipe_constant_buffer {
};
-struct pipe_fs_state {
- unsigned inputs_read; /* FRAG_ATTRIB_* */
+struct pipe_shader_state {
+ unsigned inputs_read; /* FRAG/VERT_ATTRIB_* */
const struct tgsi_token *tokens;
struct pipe_constant_buffer *constants; /* XXX temporary? */
};
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index f45cb6fe2c4..8f184c644a2 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -63,6 +63,7 @@ enum interp_mode {
#define SP_NEW_TEXTURE 0x800
#define SP_NEW_STENCIL 0x1000
#define SP_NEW_VERTEX 0x2000
+#define SP_NEW_VS 0x4000
struct softpipe_context {
@@ -79,7 +80,8 @@ struct softpipe_context {
struct pipe_clip_state clip;
struct pipe_depth_state depth_test;
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_scissor_state scissor;
struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/mesa/pipe/softpipe/sp_state.h
index d754acaa38a..f25a20a5e3f 100644
--- a/src/mesa/pipe/softpipe/sp_state.h
+++ b/src/mesa/pipe/softpipe/sp_state.h
@@ -56,7 +56,10 @@ void softpipe_set_depth_test_state( struct pipe_context *,
const struct pipe_depth_state * );
void softpipe_set_fs_state( struct pipe_context *,
- const struct pipe_fs_state * );
+ const struct pipe_shader_state * );
+
+void softpipe_set_vs_state( struct pipe_context *,
+ const struct pipe_shader_state * );
void softpipe_set_polygon_stipple( struct pipe_context *,
const struct pipe_poly_stipple * );
diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/mesa/pipe/softpipe/sp_state_fs.c
index c7ef1f1cfc9..3505c2f1fb6 100644
--- a/src/mesa/pipe/softpipe/sp_state_fs.c
+++ b/src/mesa/pipe/softpipe/sp_state_fs.c
@@ -31,7 +31,7 @@
void softpipe_set_fs_state( struct pipe_context *pipe,
- const struct pipe_fs_state *fs )
+ const struct pipe_shader_state *fs )
{
struct softpipe_context *softpipe = softpipe_context(pipe);
@@ -41,10 +41,12 @@ void softpipe_set_fs_state( struct pipe_context *pipe,
}
+void softpipe_set_vs_state( struct pipe_context *pipe,
+ const struct pipe_shader_state *vs )
+{
+ struct softpipe_context *softpipe = softpipe_context(pipe);
+ memcpy(&softpipe->vs, vs, sizeof(*vs));
-
-
-
-
-
+ softpipe->dirty |= SP_NEW_VS;
+}
diff --git a/src/mesa/state_tracker/st_atom_fs.c b/src/mesa/state_tracker/st_atom_fs.c
index 58875de3f94..9731ab6ceee 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 2f7ade73e42..3777c53d480 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 dd27760a58b..11261f1d99c 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 13843d9b7fe..25ed20a5f84 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 8dcb2ceb487..b077fdf0698 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;
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 06:13:59 +0000