Track fragment and vertex shader code generation via pipe shader state objects.

Unfortunately, the generated fragment shader code is effectively unusable until
it handles quad->mask.

4 files changed, 30 insertions, 1 deletions

diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 610e7ad6899..daccc8fe238 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -249,6 +249,12 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
 {
    struct softpipe_context *softpipe = CALLOC_STRUCT(softpipe_context);
 
+#if defined(__i386__) || defined(__386__)
+   softpipe->use_sse = getenv("GALLIUM_SSE") != NULL;
+#else
+   softpipe->use_sse = false;
+#endif
+
    softpipe->pipe.winsys = pipe_winsys;
    softpipe->pipe.destroy = softpipe_destroy;
 
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index ccf29b5683d..4f429e81397 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -154,6 +154,8 @@ struct softpipe_context {
    struct draw_stage *vbuf;
 
    struct pipe_surface *cbuf;      /**< current color buffer (one of cbufs) */
+
+   int use_sse : 1;
 };
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index f394c587dc8..a8c25c48683 100755
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -103,7 +103,8 @@ shade_quad(
    machine->Inputs[0].xyzw[1].f[3] = fy + 1.0f;
 
    /* run shader */
-   if( softpipe->fs->executable != NULL ) {
+   /* XXX: Generated code effectively unusable until it handles quad->mask */
+   if( !quad->mask && softpipe->fs->executable != NULL ) {
       codegen_function func = (codegen_function) softpipe->fs->executable;
       func(
          machine->Inputs,
diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/mesa/pipe/softpipe/sp_state_fs.c
index 88d9bd97168..5547c849ac9 100644
--- a/src/mesa/pipe/softpipe/sp_state_fs.c
+++ b/src/mesa/pipe/softpipe/sp_state_fs.c
@@ -31,17 +31,31 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/draw/draw_context.h"
+#include "pipe/tgsi/exec/tgsi_core.h"
 
 
 void * softpipe_create_fs_state(struct pipe_context *pipe,
                                 const struct pipe_shader_state *templ)
 {
+   struct softpipe_context *softpipe = softpipe_context(pipe);
+
    /* Decide whether we'll be codegenerating this shader and if so do
     * that now.
     */
 
    struct pipe_shader_state *state = malloc(sizeof(struct pipe_shader_state));
    memcpy(state, templ, sizeof(struct pipe_shader_state));
+
+#if defined(__i386__) || defined(__386__)
+   if (softpipe->use_sse) {
+      x86_init_func( &state->sse2_program );
+
+      tgsi_emit_sse2_fs( state->tokens, &state->sse2_program );
+
+      state->executable = (void *)x86_get_func( &state->sse2_program );
+   }
+#endif
+
    return state;
 }
 
@@ -57,6 +71,12 @@ void softpipe_bind_fs_state(struct pipe_context *pipe, void *fs)
 void softpipe_delete_fs_state(struct pipe_context *pipe,
                               void *shader)
 {
+#if defined(__i386__) || defined(__386__)
+   struct pipe_shader_state *state = shader;
+
+   x86_release_func( &state->sse2_program );
+#endif
+
    free(shader);
 }