Respect use_sse flag.

diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index 1ff4406a4b2be5c9aa196f422c53b27e94957de6..701a68ec6abc684e2e8bd286ee235932e7ef32aa 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -104,7 +104,7 @@ shade_quad(
    /* run shader */
 #if defined(__i386__) || defined(__386__)
    /* XXX: Generated code effectively unusable until it handles quad->mask */
-   if( !quad->mask ) {
+   if( !quad->mask && softpipe->use_sse ) {
       codegen_function func = (codegen_function) x86_get_func( &softpipe->fs->sse2_program );
       func(
          machine->Inputs,

diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/mesa/pipe/softpipe/sp_state_fs.c
index 86aa80c0fcaa9a991f2ed449184aac0e316f8336..a94ec1e92ca42c52dc48cf6378dbd9e0bede6750 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_state_fs.c
+++ b/src/mesa/pipe/softpipe/sp_state_fs.c
@@ -49,7 +49,6 @@ void * softpipe_create_fs_state(struct pipe_context *pipe,
 #if defined(__i386__) || defined(__386__)
    if (softpipe->use_sse) {
       x86_init_func( &state->sse2_program );
-
       tgsi_emit_sse2_fs( state->shader.tokens, &state->sse2_program );
    }
 #endif
@@ -69,13 +68,13 @@ 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 sp_fragment_shader_state *state = shader;
 
+#if defined(__i386__) || defined(__386__)
    x86_release_func( &state->sse2_program );
 #endif
 
-   free(shader);
+   free( state );
 }