gallium: michel's patch to rework texture/sampler binding interface

Bind all the samplers/textures at once rather than piecemeal.
This is easier for drivers to understand.

6 files changed, 891 insertions, 865 deletions

diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index fa16ed94e8..316ae552b8 100644
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -1,243 +1,243 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-/* Author:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "draw/draw_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_inlines.h"
-#include "pipe/p_util.h"
-#include "sp_clear.h"
-#include "sp_context.h"
-#include "sp_flush.h"
-#include "sp_prim_setup.h"
-#include "sp_prim_vbuf.h"
-#include "sp_state.h"
-#include "sp_surface.h"
-#include "sp_tile_cache.h"
-#include "sp_texture.h"
-#include "sp_winsys.h"
-#include "sp_query.h"
-
-
-
-/**
- * Map any drawing surfaces which aren't already mapped
- */
-void
-softpipe_map_surfaces(struct softpipe_context *sp)
-{
-   unsigned i;
-
-   for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
-      sp_tile_cache_map_surfaces(sp->cbuf_cache[i]);
-   }
-
-   sp_tile_cache_map_surfaces(sp->zsbuf_cache);
-}
-
-
-/**
- * Unmap any mapped drawing surfaces
- */
-void
-softpipe_unmap_surfaces(struct softpipe_context *sp)
-{
-   uint i;
-
-   for (i = 0; i < sp->framebuffer.num_cbufs; i++)
-      sp_flush_tile_cache(sp, sp->cbuf_cache[i]);
-   sp_flush_tile_cache(sp, sp->zsbuf_cache);
-
-   for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
-      sp_tile_cache_unmap_surfaces(sp->cbuf_cache[i]);
-   }
-   sp_tile_cache_unmap_surfaces(sp->zsbuf_cache);
-}
-
-
-static void softpipe_destroy( struct pipe_context *pipe )
-{
-   struct softpipe_context *softpipe = softpipe_context( pipe );
-   struct pipe_winsys *ws = pipe->winsys;
-   uint i;
-
-   draw_destroy( softpipe->draw );
-
-   softpipe->quad.polygon_stipple->destroy( softpipe->quad.polygon_stipple );
-   softpipe->quad.earlyz->destroy( softpipe->quad.earlyz );
-   softpipe->quad.shade->destroy( softpipe->quad.shade );
-   softpipe->quad.alpha_test->destroy( softpipe->quad.alpha_test );
-   softpipe->quad.depth_test->destroy( softpipe->quad.depth_test );
-   softpipe->quad.stencil_test->destroy( softpipe->quad.stencil_test );
-   softpipe->quad.occlusion->destroy( softpipe->quad.occlusion );
-   softpipe->quad.coverage->destroy( softpipe->quad.coverage );
-   softpipe->quad.bufloop->destroy( softpipe->quad.bufloop );
-   softpipe->quad.blend->destroy( softpipe->quad.blend );
-   softpipe->quad.colormask->destroy( softpipe->quad.colormask );
-   softpipe->quad.output->destroy( softpipe->quad.output );
-
-   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)
-      sp_destroy_tile_cache(softpipe->cbuf_cache[i]);
-   sp_destroy_tile_cache(softpipe->zsbuf_cache);
-
-   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
-      sp_destroy_tile_cache(softpipe->tex_cache[i]);
-
-   for (i = 0; i < Elements(softpipe->constants); i++) {
-      if (softpipe->constants[i].buffer) {
-         pipe_buffer_reference(ws, &softpipe->constants[i].buffer, NULL);
-      }
-   }
-
-   FREE( softpipe );
-}
-
-
-struct pipe_context *
-softpipe_create( struct pipe_screen *screen,
-                 struct pipe_winsys *pipe_winsys,
-                 struct softpipe_winsys *softpipe_winsys )
-{
-   struct softpipe_context *softpipe = CALLOC_STRUCT(softpipe_context);
-   uint i;
-
-#if defined(__i386__) || defined(__386__)
-   softpipe->use_sse = GETENV( "GALLIUM_NOSSE" ) == NULL;
-#else
-   softpipe->use_sse = FALSE;
-#endif
-
-   softpipe->dump_fs = GETENV( "GALLIUM_DUMP_FS" ) != NULL;
-
-   softpipe->pipe.winsys = pipe_winsys;
-   softpipe->pipe.screen = screen;
-   softpipe->pipe.destroy = softpipe_destroy;
-
-   /* state setters */
-   softpipe->pipe.create_blend_state = softpipe_create_blend_state;
-   softpipe->pipe.bind_blend_state   = softpipe_bind_blend_state;
-   softpipe->pipe.delete_blend_state = softpipe_delete_blend_state;
-
-   softpipe->pipe.create_sampler_state = softpipe_create_sampler_state;
-   softpipe->pipe.bind_sampler_state   = softpipe_bind_sampler_state;
-   softpipe->pipe.delete_sampler_state = softpipe_delete_sampler_state;
-
-   softpipe->pipe.create_depth_stencil_alpha_state = softpipe_create_depth_stencil_state;
-   softpipe->pipe.bind_depth_stencil_alpha_state   = softpipe_bind_depth_stencil_state;
-   softpipe->pipe.delete_depth_stencil_alpha_state = softpipe_delete_depth_stencil_state;
-
-   softpipe->pipe.create_rasterizer_state = softpipe_create_rasterizer_state;
-   softpipe->pipe.bind_rasterizer_state   = softpipe_bind_rasterizer_state;
-   softpipe->pipe.delete_rasterizer_state = softpipe_delete_rasterizer_state;
-
-   softpipe->pipe.create_fs_state = softpipe_create_fs_state;
-   softpipe->pipe.bind_fs_state   = softpipe_bind_fs_state;
-   softpipe->pipe.delete_fs_state = softpipe_delete_fs_state;
-
-   softpipe->pipe.create_vs_state = softpipe_create_vs_state;
-   softpipe->pipe.bind_vs_state   = softpipe_bind_vs_state;
-   softpipe->pipe.delete_vs_state = softpipe_delete_vs_state;
-
-   softpipe->pipe.set_blend_color = softpipe_set_blend_color;
-   softpipe->pipe.set_clip_state = softpipe_set_clip_state;
-   softpipe->pipe.set_constant_buffer = softpipe_set_constant_buffer;
-   softpipe->pipe.set_framebuffer_state = softpipe_set_framebuffer_state;
-   softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple;
-   softpipe->pipe.set_scissor_state = softpipe_set_scissor_state;
-   softpipe->pipe.set_sampler_texture = softpipe_set_sampler_texture;
-   softpipe->pipe.set_viewport_state = softpipe_set_viewport_state;
-
-   softpipe->pipe.set_vertex_buffer = softpipe_set_vertex_buffer;
-   softpipe->pipe.set_vertex_element = softpipe_set_vertex_element;
-
-   softpipe->pipe.draw_arrays = softpipe_draw_arrays;
-   softpipe->pipe.draw_elements = softpipe_draw_elements;
-
-   softpipe->pipe.clear = softpipe_clear;
-   softpipe->pipe.flush = softpipe_flush;
-
-   softpipe_init_query_funcs( softpipe );
-   softpipe_init_texture_funcs( softpipe );
-
-   /*
-    * Alloc caches for accessing drawing surfaces and textures.
-    * Must be before quad stage setup!
-    */
-   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)
-      softpipe->cbuf_cache[i] = sp_create_tile_cache();
-   softpipe->zsbuf_cache = sp_create_tile_cache();
-
-   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
-      softpipe->tex_cache[i] = sp_create_tile_cache();
-
-
-   /* setup quad rendering stages */
-   softpipe->quad.polygon_stipple = sp_quad_polygon_stipple_stage(softpipe);
-   softpipe->quad.earlyz = sp_quad_earlyz_stage(softpipe);
-   softpipe->quad.shade = sp_quad_shade_stage(softpipe);
-   softpipe->quad.alpha_test = sp_quad_alpha_test_stage(softpipe);
-   softpipe->quad.depth_test = sp_quad_depth_test_stage(softpipe);
-   softpipe->quad.stencil_test = sp_quad_stencil_test_stage(softpipe);
-   softpipe->quad.occlusion = sp_quad_occlusion_stage(softpipe);
-   softpipe->quad.coverage = sp_quad_coverage_stage(softpipe);
-   softpipe->quad.bufloop = sp_quad_bufloop_stage(softpipe);
-   softpipe->quad.blend = sp_quad_blend_stage(softpipe);
-   softpipe->quad.colormask = sp_quad_colormask_stage(softpipe);
-   softpipe->quad.output = sp_quad_output_stage(softpipe);
-
-   softpipe->winsys = softpipe_winsys;
-
-   /*
-    * Create drawing context and plug our rendering stage into it.
-    */
-   softpipe->draw = draw_create();
-   assert(softpipe->draw);
-   softpipe->setup = sp_draw_render_stage(softpipe);
-
-   if (GETENV( "SP_VBUF" ) != NULL) {
-      sp_init_vbuf(softpipe);
-   }
-   else {
-      draw_set_rasterize_stage(softpipe->draw, softpipe->setup);
-   }
-
-   /* plug in AA line/point stages */
-   draw_install_aaline_stage(softpipe->draw, &softpipe->pipe);
-   draw_install_aapoint_stage(softpipe->draw, &softpipe->pipe);
-
-#if USE_DRAW_STAGE_PSTIPPLE
-   /* Do polygon stipple w/ texture map + frag prog? */
-   draw_install_pstipple_stage(softpipe->draw, &softpipe->pipe);
-#endif
-
-   sp_init_surface_functions(softpipe);
-
-   return &softpipe->pipe;
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, sub license, and/or sell copies of the Software, and to

+ * permit persons to whom the Software is furnished to do so, subject to

+ * the following conditions:

+ * 

+ * The above copyright notice and this permission notice (including the

+ * next paragraph) shall be included in all copies or substantial portions

+ * of the Software.

+ * 

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ * 

+ **************************************************************************/

+

+/* Author:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#include "draw/draw_context.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_inlines.h"

+#include "pipe/p_util.h"

+#include "sp_clear.h"

+#include "sp_context.h"

+#include "sp_flush.h"

+#include "sp_prim_setup.h"

+#include "sp_prim_vbuf.h"

+#include "sp_state.h"

+#include "sp_surface.h"

+#include "sp_tile_cache.h"

+#include "sp_texture.h"

+#include "sp_winsys.h"

+#include "sp_query.h"

+

+

+

+/**

+ * Map any drawing surfaces which aren't already mapped

+ */

+void

+softpipe_map_surfaces(struct softpipe_context *sp)

+{

+   unsigned i;

+

+   for (i = 0; i < sp->framebuffer.num_cbufs; i++) {

+      sp_tile_cache_map_surfaces(sp->cbuf_cache[i]);

+   }

+

+   sp_tile_cache_map_surfaces(sp->zsbuf_cache);

+}

+

+

+/**

+ * Unmap any mapped drawing surfaces

+ */

+void

+softpipe_unmap_surfaces(struct softpipe_context *sp)

+{

+   uint i;

+

+   for (i = 0; i < sp->framebuffer.num_cbufs; i++)

+      sp_flush_tile_cache(sp, sp->cbuf_cache[i]);

+   sp_flush_tile_cache(sp, sp->zsbuf_cache);

+

+   for (i = 0; i < sp->framebuffer.num_cbufs; i++) {

+      sp_tile_cache_unmap_surfaces(sp->cbuf_cache[i]);

+   }

+   sp_tile_cache_unmap_surfaces(sp->zsbuf_cache);

+}

+

+

+static void softpipe_destroy( struct pipe_context *pipe )

+{

+   struct softpipe_context *softpipe = softpipe_context( pipe );

+   struct pipe_winsys *ws = pipe->winsys;

+   uint i;

+

+   draw_destroy( softpipe->draw );

+

+   softpipe->quad.polygon_stipple->destroy( softpipe->quad.polygon_stipple );

+   softpipe->quad.earlyz->destroy( softpipe->quad.earlyz );

+   softpipe->quad.shade->destroy( softpipe->quad.shade );

+   softpipe->quad.alpha_test->destroy( softpipe->quad.alpha_test );

+   softpipe->quad.depth_test->destroy( softpipe->quad.depth_test );

+   softpipe->quad.stencil_test->destroy( softpipe->quad.stencil_test );

+   softpipe->quad.occlusion->destroy( softpipe->quad.occlusion );

+   softpipe->quad.coverage->destroy( softpipe->quad.coverage );

+   softpipe->quad.bufloop->destroy( softpipe->quad.bufloop );

+   softpipe->quad.blend->destroy( softpipe->quad.blend );

+   softpipe->quad.colormask->destroy( softpipe->quad.colormask );

+   softpipe->quad.output->destroy( softpipe->quad.output );

+

+   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)

+      sp_destroy_tile_cache(softpipe->cbuf_cache[i]);

+   sp_destroy_tile_cache(softpipe->zsbuf_cache);

+

+   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)

+      sp_destroy_tile_cache(softpipe->tex_cache[i]);

+

+   for (i = 0; i < Elements(softpipe->constants); i++) {

+      if (softpipe->constants[i].buffer) {

+         pipe_buffer_reference(ws, &softpipe->constants[i].buffer, NULL);

+      }

+   }

+

+   FREE( softpipe );

+}

+

+

+struct pipe_context *

+softpipe_create( struct pipe_screen *screen,

+                 struct pipe_winsys *pipe_winsys,

+                 struct softpipe_winsys *softpipe_winsys )

+{

+   struct softpipe_context *softpipe = CALLOC_STRUCT(softpipe_context);

+   uint i;

+

+#if defined(__i386__) || defined(__386__)

+   softpipe->use_sse = GETENV( "GALLIUM_NOSSE" ) == NULL;

+#else

+   softpipe->use_sse = FALSE;

+#endif

+

+   softpipe->dump_fs = GETENV( "GALLIUM_DUMP_FS" ) != NULL;

+

+   softpipe->pipe.winsys = pipe_winsys;

+   softpipe->pipe.screen = screen;

+   softpipe->pipe.destroy = softpipe_destroy;

+

+   /* state setters */

+   softpipe->pipe.create_blend_state = softpipe_create_blend_state;

+   softpipe->pipe.bind_blend_state   = softpipe_bind_blend_state;

+   softpipe->pipe.delete_blend_state = softpipe_delete_blend_state;

+

+   softpipe->pipe.create_sampler_state = softpipe_create_sampler_state;

+   softpipe->pipe.bind_sampler_states  = softpipe_bind_sampler_states;

+   softpipe->pipe.delete_sampler_state = softpipe_delete_sampler_state;

+

+   softpipe->pipe.create_depth_stencil_alpha_state = softpipe_create_depth_stencil_state;

+   softpipe->pipe.bind_depth_stencil_alpha_state   = softpipe_bind_depth_stencil_state;

+   softpipe->pipe.delete_depth_stencil_alpha_state = softpipe_delete_depth_stencil_state;

+

+   softpipe->pipe.create_rasterizer_state = softpipe_create_rasterizer_state;

+   softpipe->pipe.bind_rasterizer_state   = softpipe_bind_rasterizer_state;

+   softpipe->pipe.delete_rasterizer_state = softpipe_delete_rasterizer_state;

+

+   softpipe->pipe.create_fs_state = softpipe_create_fs_state;

+   softpipe->pipe.bind_fs_state   = softpipe_bind_fs_state;

+   softpipe->pipe.delete_fs_state = softpipe_delete_fs_state;

+

+   softpipe->pipe.create_vs_state = softpipe_create_vs_state;

+   softpipe->pipe.bind_vs_state   = softpipe_bind_vs_state;

+   softpipe->pipe.delete_vs_state = softpipe_delete_vs_state;

+

+   softpipe->pipe.set_blend_color = softpipe_set_blend_color;

+   softpipe->pipe.set_clip_state = softpipe_set_clip_state;

+   softpipe->pipe.set_constant_buffer = softpipe_set_constant_buffer;

+   softpipe->pipe.set_framebuffer_state = softpipe_set_framebuffer_state;

+   softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple;

+   softpipe->pipe.set_scissor_state = softpipe_set_scissor_state;

+   softpipe->pipe.set_sampler_textures = softpipe_set_sampler_textures;

+   softpipe->pipe.set_viewport_state = softpipe_set_viewport_state;

+

+   softpipe->pipe.set_vertex_buffer = softpipe_set_vertex_buffer;

+   softpipe->pipe.set_vertex_element = softpipe_set_vertex_element;

+

+   softpipe->pipe.draw_arrays = softpipe_draw_arrays;

+   softpipe->pipe.draw_elements = softpipe_draw_elements;

+

+   softpipe->pipe.clear = softpipe_clear;

+   softpipe->pipe.flush = softpipe_flush;

+

+   softpipe_init_query_funcs( softpipe );

+   softpipe_init_texture_funcs( softpipe );

+

+   /*

+    * Alloc caches for accessing drawing surfaces and textures.

+    * Must be before quad stage setup!

+    */

+   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)

+      softpipe->cbuf_cache[i] = sp_create_tile_cache();

+   softpipe->zsbuf_cache = sp_create_tile_cache();

+

+   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)

+      softpipe->tex_cache[i] = sp_create_tile_cache();

+

+

+   /* setup quad rendering stages */

+   softpipe->quad.polygon_stipple = sp_quad_polygon_stipple_stage(softpipe);

+   softpipe->quad.earlyz = sp_quad_earlyz_stage(softpipe);

+   softpipe->quad.shade = sp_quad_shade_stage(softpipe);

+   softpipe->quad.alpha_test = sp_quad_alpha_test_stage(softpipe);

+   softpipe->quad.depth_test = sp_quad_depth_test_stage(softpipe);

+   softpipe->quad.stencil_test = sp_quad_stencil_test_stage(softpipe);

+   softpipe->quad.occlusion = sp_quad_occlusion_stage(softpipe);

+   softpipe->quad.coverage = sp_quad_coverage_stage(softpipe);

+   softpipe->quad.bufloop = sp_quad_bufloop_stage(softpipe);

+   softpipe->quad.blend = sp_quad_blend_stage(softpipe);

+   softpipe->quad.colormask = sp_quad_colormask_stage(softpipe);

+   softpipe->quad.output = sp_quad_output_stage(softpipe);

+

+   softpipe->winsys = softpipe_winsys;

+

+   /*

+    * Create drawing context and plug our rendering stage into it.

+    */

+   softpipe->draw = draw_create();

+   assert(softpipe->draw);

+   softpipe->setup = sp_draw_render_stage(softpipe);

+

+   if (GETENV( "SP_VBUF" ) != NULL) {

+      sp_init_vbuf(softpipe);

+   }

+   else {

+      draw_set_rasterize_stage(softpipe->draw, softpipe->setup);

+   }

+

+   /* plug in AA line/point stages */

+   draw_install_aaline_stage(softpipe->draw, &softpipe->pipe);

+   draw_install_aapoint_stage(softpipe->draw, &softpipe->pipe);

+

+#if USE_DRAW_STAGE_PSTIPPLE

+   /* Do polygon stipple w/ texture map + frag prog? */

+   draw_install_pstipple_stage(softpipe->draw, &softpipe->pipe);

+#endif

+

+   sp_init_surface_functions(softpipe);

+

+   return &softpipe->pipe;

+}

diff --git a/src/gallium/drivers/softpipe/sp_context.h b/src/gallium/drivers/softpipe/sp_context.h
index feeafc7084..19e6cfaf02 100644
--- a/src/gallium/drivers/softpipe/sp_context.h
+++ b/src/gallium/drivers/softpipe/sp_context.h
@@ -81,6 +81,9 @@ struct softpipe_context {
    struct pipe_vertex_element vertex_element[PIPE_ATTRIB_MAX];
    unsigned dirty;
 
+   unsigned num_samplers;
+   unsigned num_textures;
+
    /* Counter for occlusion queries.  Note this supports overlapping
     * queries.
     */
diff --git a/src/gallium/drivers/softpipe/sp_quad_fs.c b/src/gallium/drivers/softpipe/sp_quad_fs.c
index 1fbb2e38c4..9198198db3 100644
--- a/src/gallium/drivers/softpipe/sp_quad_fs.c
+++ b/src/gallium/drivers/softpipe/sp_quad_fs.c
@@ -1,208 +1,209 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-/* Vertices are just an array of floats, with all the attributes
- * packed.  We currently assume a layout like:
- *
- * attr[0][0..3] - window position
- * attr[1..n][0..3] - remaining attributes.
- *
- * Attributes are assumed to be 4 floats wide but are packed so that
- * all the enabled attributes run contiguously.
- */
-
-#include "pipe/p_util.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_shader_tokens.h"
-
-#include "sp_context.h"
-#include "sp_state.h"
-#include "sp_headers.h"
-#include "sp_quad.h"
-#include "sp_texture.h"
-#include "sp_tex_sample.h"
-
-
-struct quad_shade_stage
-{
-   struct quad_stage stage;
-   struct tgsi_sampler samplers[PIPE_MAX_SAMPLERS];
-   struct tgsi_exec_machine machine;
-   struct tgsi_exec_vector *inputs, *outputs;
-   int colorOutSlot, depthOutSlot;
-};
-
-
-/** cast wrapper */
-static INLINE struct quad_shade_stage *
-quad_shade_stage(struct quad_stage *qs)
-{
-   return (struct quad_shade_stage *) qs;
-}
-
-
-
-/**
- * Execute fragment shader for the four fragments in the quad.
- */
-static void
-shade_quad(
-   struct quad_stage *qs,
-   struct quad_header *quad )
-{
-   struct quad_shade_stage *qss = quad_shade_stage( qs );
-   struct softpipe_context *softpipe = qs->softpipe;
-   struct tgsi_exec_machine *machine = &qss->machine;
-
-   /* Consts do not require 16 byte alignment. */
-   machine->Consts = softpipe->mapped_constants[PIPE_SHADER_FRAGMENT];
-
-   machine->InterpCoefs = quad->coef;
-
-   /* run shader */
-   quad->mask &= softpipe->fs->run( softpipe->fs, 
-				    &qss->machine,
-				    quad );
-
-   /* store result color */
-   if (qss->colorOutSlot >= 0) {
-      /* XXX need to handle multiple color outputs someday */
-      assert(qss->stage.softpipe->fs->info.output_semantic_name[qss->colorOutSlot]
-             == TGSI_SEMANTIC_COLOR);
-      memcpy(
-             quad->outputs.color,
-             &machine->Outputs[qss->colorOutSlot].xyzw[0].f[0],
-             sizeof( quad->outputs.color ) );
-   }
-
-   /*
-    * XXX the following code for updating quad->outputs.depth
-    * isn't really needed if we did early z testing.
-    */
-
-   /* store result Z */
-   if (qss->depthOutSlot >= 0) {
-      /* output[slot] is new Z */
-      uint i;
-      for (i = 0; i < 4; i++) {
-         quad->outputs.depth[i] = machine->Outputs[0].xyzw[2].f[i];
-      }
-   }
-   else {
-      /* copy input Z (which was interpolated by the executor) to output Z */
-      uint i;
-      for (i = 0; i < 4; i++) {
-         quad->outputs.depth[i] = machine->Inputs[0].xyzw[2].f[i];
-         /* XXX not sure the above line is always correct.  The following
-          * might be better:
-         quad->outputs.depth[i] = machine->QuadPos.xyzw[2].f[i];
-          */
-      }
-   }
-
-   /* shader may cull fragments */
-   if( quad->mask ) {
-      qs->next->run( qs->next, quad );
-   }
-}
-
-/**
- * Per-primitive (or per-begin?) setup
- */
-static void shade_begin(struct quad_stage *qs)
-{
-   struct quad_shade_stage *qss = quad_shade_stage(qs);
-   struct softpipe_context *softpipe = qs->softpipe;
-   unsigned i;
-
-   /* set TGSI sampler state that varies */
-   for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
-      qss->samplers[i].state = softpipe->sampler[i];
-      qss->samplers[i].texture = softpipe->texture[i];
-   }
-
-   /* find output slots for depth, color */
-   qss->colorOutSlot = -1;
-   qss->depthOutSlot = -1;
-   for (i = 0; i < qss->stage.softpipe->fs->info.num_outputs; i++) {
-      switch (qss->stage.softpipe->fs->info.output_semantic_name[i]) {
-      case TGSI_SEMANTIC_POSITION:
-         qss->depthOutSlot = i;
-         break;
-      case TGSI_SEMANTIC_COLOR:
-         qss->colorOutSlot = i;
-         break;
-      }
-   }
-   
-   softpipe->fs->prepare( softpipe->fs, 
-			  &qss->machine,
-			  qss->samplers );
-
-   qs->next->begin(qs->next);
-}
-
-
-static void shade_destroy(struct quad_stage *qs)
-{
-   struct quad_shade_stage *qss = (struct quad_shade_stage *) qs;
-
-   tgsi_exec_machine_free_data(&qss->machine);
-   FREE( qss->inputs );
-   FREE( qss->outputs );
-   FREE( qs );
-}
-
-
-struct quad_stage *sp_quad_shade_stage( struct softpipe_context *softpipe )
-{
-   struct quad_shade_stage *qss = CALLOC_STRUCT(quad_shade_stage);
-   uint i;
-
-   /* allocate storage for program inputs/outputs, aligned to 16 bytes */
-   qss->inputs = MALLOC(PIPE_ATTRIB_MAX * sizeof(*qss->inputs) + 16);
-   qss->outputs = MALLOC(PIPE_ATTRIB_MAX * sizeof(*qss->outputs) + 16);
-   qss->machine.Inputs = align16(qss->inputs);
-   qss->machine.Outputs = align16(qss->outputs);
-
-   qss->stage.softpipe = softpipe;
-   qss->stage.begin = shade_begin;
-   qss->stage.run = shade_quad;
-   qss->stage.destroy = shade_destroy;
-
-   /* set TGSI sampler state that's constant */
-   for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
-      assert(softpipe->tex_cache[i]);
-      qss->samplers[i].get_samples = sp_get_samples;
-      qss->samplers[i].pipe = &softpipe->pipe;
-      qss->samplers[i].cache = softpipe->tex_cache[i];
-   }
-
-   tgsi_exec_machine_init( &qss->machine );
-
-   return &qss->stage;
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, sub license, and/or sell copies of the Software, and to

+ * permit persons to whom the Software is furnished to do so, subject to

+ * the following conditions:

+ * 

+ * The above copyright notice and this permission notice (including the

+ * next paragraph) shall be included in all copies or substantial portions

+ * of the Software.

+ * 

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ * 

+ **************************************************************************/

+

+/* Vertices are just an array of floats, with all the attributes

+ * packed.  We currently assume a layout like:

+ *

+ * attr[0][0..3] - window position

+ * attr[1..n][0..3] - remaining attributes.

+ *

+ * Attributes are assumed to be 4 floats wide but are packed so that

+ * all the enabled attributes run contiguously.

+ */

+

+#include "pipe/p_util.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_shader_tokens.h"

+

+#include "sp_context.h"

+#include "sp_state.h"

+#include "sp_headers.h"

+#include "sp_quad.h"

+#include "sp_texture.h"

+#include "sp_tex_sample.h"

+

+

+struct quad_shade_stage

+{

+   struct quad_stage stage;

+   struct tgsi_sampler samplers[PIPE_MAX_SAMPLERS];

+   struct tgsi_exec_machine machine;

+   struct tgsi_exec_vector *inputs, *outputs;

+   int colorOutSlot, depthOutSlot;

+};

+

+

+/** cast wrapper */

+static INLINE struct quad_shade_stage *

+quad_shade_stage(struct quad_stage *qs)

+{

+   return (struct quad_shade_stage *) qs;

+}

+

+

+

+/**

+ * Execute fragment shader for the four fragments in the quad.

+ */

+static void

+shade_quad(

+   struct quad_stage *qs,

+   struct quad_header *quad )

+{

+   struct quad_shade_stage *qss = quad_shade_stage( qs );

+   struct softpipe_context *softpipe = qs->softpipe;

+   struct tgsi_exec_machine *machine = &qss->machine;

+

+   /* Consts do not require 16 byte alignment. */

+   machine->Consts = softpipe->mapped_constants[PIPE_SHADER_FRAGMENT];

+

+   machine->InterpCoefs = quad->coef;

+

+   /* run shader */

+   quad->mask &= softpipe->fs->run( softpipe->fs, 

+				    &qss->machine,

+				    quad );

+

+   /* store result color */

+   if (qss->colorOutSlot >= 0) {

+      /* XXX need to handle multiple color outputs someday */

+      assert(qss->stage.softpipe->fs->info.output_semantic_name[qss->colorOutSlot]

+             == TGSI_SEMANTIC_COLOR);

+      memcpy(

+             quad->outputs.color,

+             &machine->Outputs[qss->colorOutSlot].xyzw[0].f[0],

+             sizeof( quad->outputs.color ) );

+   }

+

+   /*

+    * XXX the following code for updating quad->outputs.depth

+    * isn't really needed if we did early z testing.

+    */

+

+   /* store result Z */

+   if (qss->depthOutSlot >= 0) {

+      /* output[slot] is new Z */

+      uint i;

+      for (i = 0; i < 4; i++) {

+         quad->outputs.depth[i] = machine->Outputs[0].xyzw[2].f[i];

+      }

+   }

+   else {

+      /* copy input Z (which was interpolated by the executor) to output Z */

+      uint i;

+      for (i = 0; i < 4; i++) {

+         quad->outputs.depth[i] = machine->Inputs[0].xyzw[2].f[i];

+         /* XXX not sure the above line is always correct.  The following

+          * might be better:

+         quad->outputs.depth[i] = machine->QuadPos.xyzw[2].f[i];

+          */

+      }

+   }

+

+   /* shader may cull fragments */

+   if( quad->mask ) {

+      qs->next->run( qs->next, quad );

+   }

+}

+

+/**

+ * Per-primitive (or per-begin?) setup

+ */

+static void shade_begin(struct quad_stage *qs)

+{

+   struct quad_shade_stage *qss = quad_shade_stage(qs);

+   struct softpipe_context *softpipe = qs->softpipe;

+   unsigned i;

+   unsigned num = MAX2(softpipe->num_textures, softpipe->num_samplers);

+

+   /* set TGSI sampler state that varies */

+   for (i = 0; i < num; i++) {

+      qss->samplers[i].state = softpipe->sampler[i];

+      qss->samplers[i].texture = softpipe->texture[i];

+   }

+

+   /* find output slots for depth, color */

+   qss->colorOutSlot = -1;

+   qss->depthOutSlot = -1;

+   for (i = 0; i < qss->stage.softpipe->fs->info.num_outputs; i++) {

+      switch (qss->stage.softpipe->fs->info.output_semantic_name[i]) {

+      case TGSI_SEMANTIC_POSITION:

+         qss->depthOutSlot = i;

+         break;

+      case TGSI_SEMANTIC_COLOR:

+         qss->colorOutSlot = i;

+         break;

+      }

+   }

+   

+   softpipe->fs->prepare( softpipe->fs, 

+			  &qss->machine,

+			  qss->samplers );

+

+   qs->next->begin(qs->next);

+}

+

+

+static void shade_destroy(struct quad_stage *qs)

+{

+   struct quad_shade_stage *qss = (struct quad_shade_stage *) qs;

+

+   tgsi_exec_machine_free_data(&qss->machine);

+   FREE( qss->inputs );

+   FREE( qss->outputs );

+   FREE( qs );

+}

+

+

+struct quad_stage *sp_quad_shade_stage( struct softpipe_context *softpipe )

+{

+   struct quad_shade_stage *qss = CALLOC_STRUCT(quad_shade_stage);

+   uint i;

+

+   /* allocate storage for program inputs/outputs, aligned to 16 bytes */

+   qss->inputs = MALLOC(PIPE_ATTRIB_MAX * sizeof(*qss->inputs) + 16);

+   qss->outputs = MALLOC(PIPE_ATTRIB_MAX * sizeof(*qss->outputs) + 16);

+   qss->machine.Inputs = align16(qss->inputs);

+   qss->machine.Outputs = align16(qss->outputs);

+

+   qss->stage.softpipe = softpipe;

+   qss->stage.begin = shade_begin;

+   qss->stage.run = shade_quad;

+   qss->stage.destroy = shade_destroy;

+

+   /* set TGSI sampler state that's constant */

+   for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {

+      assert(softpipe->tex_cache[i]);

+      qss->samplers[i].get_samples = sp_get_samples;

+      qss->samplers[i].pipe = &softpipe->pipe;

+      qss->samplers[i].cache = softpipe->tex_cache[i];

+   }

+

+   tgsi_exec_machine_init( &qss->machine );

+

+   return &qss->stage;

+}

diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index 3943d4ed2b..45d159143f 100644
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -1,195 +1,195 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-/* Authors:  Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#ifndef SP_STATE_H
-#define SP_STATE_H
-
-#include "pipe/p_state.h"
-#include "tgsi/util/tgsi_scan.h"
-
-
-#define SP_NEW_VIEWPORT      0x1
-#define SP_NEW_RASTERIZER    0x2
-#define SP_NEW_FS            0x4
-#define SP_NEW_BLEND         0x8
-#define SP_NEW_CLIP          0x10
-#define SP_NEW_SCISSOR       0x20
-#define SP_NEW_STIPPLE       0x40
-#define SP_NEW_FRAMEBUFFER   0x80
-#define SP_NEW_DEPTH_STENCIL_ALPHA 0x100
-#define SP_NEW_CONSTANTS     0x200
-#define SP_NEW_SAMPLER       0x400
-#define SP_NEW_TEXTURE       0x800
-#define SP_NEW_VERTEX        0x1000
-#define SP_NEW_VS            0x2000
-#define SP_NEW_QUERY         0x4000
-
-
-struct tgsi_sampler;
-struct tgsi_exec_machine;
-
-
-/** Subclass of pipe_shader_state (though it doesn't really need to be).
- *
- * This is starting to look an awful lot like a quad pipeline stage...
- */
-struct sp_fragment_shader {
-   struct pipe_shader_state shader;
-
-   struct tgsi_shader_info info;
-
-   void (*prepare)( const struct sp_fragment_shader *shader,
-		    struct tgsi_exec_machine *machine,
-		    struct tgsi_sampler *samplers);
-
-   /* Run the shader - this interface will get cleaned up in the
-    * future:
-    */
-   unsigned (*run)( const struct sp_fragment_shader *shader,
-		    struct tgsi_exec_machine *machine,
-		    struct quad_header *quad );
-
-
-   void (*delete)( struct sp_fragment_shader * );
-};
-
-struct vertex_info;
-
-/** Subclass of pipe_shader_state */
-struct sp_vertex_shader {
-   struct pipe_shader_state shader;
-   struct draw_vertex_shader *draw_data;
-};
-
-
-
-void *
-softpipe_create_blend_state(struct pipe_context *,
-                            const struct pipe_blend_state *);
-void softpipe_bind_blend_state(struct pipe_context *,
-                               void *);
-void softpipe_delete_blend_state(struct pipe_context *,
-                                 void *);
-
-void *
-softpipe_create_sampler_state(struct pipe_context *,
-                              const struct pipe_sampler_state *);
-void softpipe_bind_sampler_state(struct pipe_context *, unsigned, void *);
-void softpipe_delete_sampler_state(struct pipe_context *, void *);
-
-void *
-softpipe_create_depth_stencil_state(struct pipe_context *,
-                                    const struct pipe_depth_stencil_alpha_state *);
-void softpipe_bind_depth_stencil_state(struct pipe_context *, void *);
-void softpipe_delete_depth_stencil_state(struct pipe_context *, void *);
-
-void *
-softpipe_create_rasterizer_state(struct pipe_context *,
-                                 const struct pipe_rasterizer_state *);
-void softpipe_bind_rasterizer_state(struct pipe_context *, void *);
-void softpipe_delete_rasterizer_state(struct pipe_context *, void *);
-
-void softpipe_set_framebuffer_state( struct pipe_context *,
-			     const struct pipe_framebuffer_state * );
-
-void softpipe_set_blend_color( struct pipe_context *pipe,
-                               const struct pipe_blend_color *blend_color );
-
-void softpipe_set_clip_state( struct pipe_context *,
-			     const struct pipe_clip_state * );
-
-void softpipe_set_constant_buffer(struct pipe_context *,
-                                  uint shader, uint index,
-                                  const struct pipe_constant_buffer *buf);
-
-void *softpipe_create_fs_state(struct pipe_context *,
-                               const struct pipe_shader_state *);
-void softpipe_bind_fs_state(struct pipe_context *, void *);
-void softpipe_delete_fs_state(struct pipe_context *, void *);
-void *softpipe_create_vs_state(struct pipe_context *,
-                               const struct pipe_shader_state *);
-void softpipe_bind_vs_state(struct pipe_context *, void *);
-void softpipe_delete_vs_state(struct pipe_context *, void *);
-
-void softpipe_set_polygon_stipple( struct pipe_context *,
-				  const struct pipe_poly_stipple * );
-
-void softpipe_set_scissor_state( struct pipe_context *,
-                                 const struct pipe_scissor_state * );
-
-void softpipe_set_sampler_texture( struct pipe_context *,
-                                 unsigned unit,
-                                 struct pipe_texture * );
-
-void softpipe_set_viewport_state( struct pipe_context *,
-                                  const struct pipe_viewport_state * );
-
-void softpipe_set_vertex_element(struct pipe_context *,
-                                 unsigned index,
-                                 const struct pipe_vertex_element *);
-
-void softpipe_set_vertex_buffer(struct pipe_context *,
-                                unsigned index,
-                                const struct pipe_vertex_buffer *);
-
-
-void softpipe_update_derived( struct softpipe_context *softpipe );
-
-
-boolean softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
-			     unsigned start, unsigned count);
-
-boolean softpipe_draw_elements(struct pipe_context *pipe,
-			       struct pipe_buffer *indexBuffer,
-			       unsigned indexSize,
-			       unsigned mode, unsigned start, unsigned count);
-
-
-void
-softpipe_map_surfaces(struct softpipe_context *sp);
-
-void
-softpipe_unmap_surfaces(struct softpipe_context *sp);
-
-void
-softpipe_map_texture_surfaces(struct softpipe_context *sp);
-
-void
-softpipe_unmap_texture_surfaces(struct softpipe_context *sp);
-
-
-struct vertex_info *
-softpipe_get_vertex_info(struct softpipe_context *softpipe);
-
-struct vertex_info *
-softpipe_get_vbuf_vertex_info(struct softpipe_context *softpipe);
-
-
-#endif
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, sub license, and/or sell copies of the Software, and to

+ * permit persons to whom the Software is furnished to do so, subject to

+ * the following conditions:

+ * 

+ * The above copyright notice and this permission notice (including the

+ * next paragraph) shall be included in all copies or substantial portions

+ * of the Software.

+ * 

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ * 

+ **************************************************************************/

+

+/* Authors:  Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#ifndef SP_STATE_H

+#define SP_STATE_H

+

+#include "pipe/p_state.h"

+#include "tgsi/util/tgsi_scan.h"

+

+

+#define SP_NEW_VIEWPORT      0x1

+#define SP_NEW_RASTERIZER    0x2

+#define SP_NEW_FS            0x4

+#define SP_NEW_BLEND         0x8

+#define SP_NEW_CLIP          0x10

+#define SP_NEW_SCISSOR       0x20

+#define SP_NEW_STIPPLE       0x40

+#define SP_NEW_FRAMEBUFFER   0x80

+#define SP_NEW_DEPTH_STENCIL_ALPHA 0x100

+#define SP_NEW_CONSTANTS     0x200

+#define SP_NEW_SAMPLER       0x400

+#define SP_NEW_TEXTURE       0x800

+#define SP_NEW_VERTEX        0x1000

+#define SP_NEW_VS            0x2000

+#define SP_NEW_QUERY         0x4000

+

+

+struct tgsi_sampler;

+struct tgsi_exec_machine;

+

+

+/** Subclass of pipe_shader_state (though it doesn't really need to be).

+ *

+ * This is starting to look an awful lot like a quad pipeline stage...

+ */

+struct sp_fragment_shader {

+   struct pipe_shader_state shader;

+

+   struct tgsi_shader_info info;

+

+   void (*prepare)( const struct sp_fragment_shader *shader,

+		    struct tgsi_exec_machine *machine,

+		    struct tgsi_sampler *samplers);

+

+   /* Run the shader - this interface will get cleaned up in the

+    * future:

+    */

+   unsigned (*run)( const struct sp_fragment_shader *shader,

+		    struct tgsi_exec_machine *machine,

+		    struct quad_header *quad );

+

+

+   void (*delete)( struct sp_fragment_shader * );

+};

+

+struct vertex_info;

+

+/** Subclass of pipe_shader_state */

+struct sp_vertex_shader {

+   struct pipe_shader_state shader;

+   struct draw_vertex_shader *draw_data;

+};

+

+

+

+void *

+softpipe_create_blend_state(struct pipe_context *,

+                            const struct pipe_blend_state *);

+void softpipe_bind_blend_state(struct pipe_context *,

+                               void *);

+void softpipe_delete_blend_state(struct pipe_context *,

+                                 void *);

+

+void *

+softpipe_create_sampler_state(struct pipe_context *,

+                              const struct pipe_sampler_state *);

+void softpipe_bind_sampler_states(struct pipe_context *, unsigned, void **);

+void softpipe_delete_sampler_state(struct pipe_context *, void *);

+

+void *

+softpipe_create_depth_stencil_state(struct pipe_context *,

+                                    const struct pipe_depth_stencil_alpha_state *);

+void softpipe_bind_depth_stencil_state(struct pipe_context *, void *);

+void softpipe_delete_depth_stencil_state(struct pipe_context *, void *);

+

+void *

+softpipe_create_rasterizer_state(struct pipe_context *,

+                                 const struct pipe_rasterizer_state *);

+void softpipe_bind_rasterizer_state(struct pipe_context *, void *);

+void softpipe_delete_rasterizer_state(struct pipe_context *, void *);

+

+void softpipe_set_framebuffer_state( struct pipe_context *,

+			     const struct pipe_framebuffer_state * );

+

+void softpipe_set_blend_color( struct pipe_context *pipe,

+                               const struct pipe_blend_color *blend_color );

+

+void softpipe_set_clip_state( struct pipe_context *,

+			     const struct pipe_clip_state * );

+

+void softpipe_set_constant_buffer(struct pipe_context *,

+                                  uint shader, uint index,

+                                  const struct pipe_constant_buffer *buf);

+

+void *softpipe_create_fs_state(struct pipe_context *,

+                               const struct pipe_shader_state *);

+void softpipe_bind_fs_state(struct pipe_context *, void *);

+void softpipe_delete_fs_state(struct pipe_context *, void *);

+void *softpipe_create_vs_state(struct pipe_context *,

+                               const struct pipe_shader_state *);

+void softpipe_bind_vs_state(struct pipe_context *, void *);

+void softpipe_delete_vs_state(struct pipe_context *, void *);

+

+void softpipe_set_polygon_stipple( struct pipe_context *,

+				  const struct pipe_poly_stipple * );

+

+void softpipe_set_scissor_state( struct pipe_context *,

+                                 const struct pipe_scissor_state * );

+

+void softpipe_set_sampler_textures( struct pipe_context *,

+                                    unsigned num,

+                                    struct pipe_texture ** );

+

+void softpipe_set_viewport_state( struct pipe_context *,

+                                  const struct pipe_viewport_state * );

+

+void softpipe_set_vertex_element(struct pipe_context *,

+                                 unsigned index,

+                                 const struct pipe_vertex_element *);

+

+void softpipe_set_vertex_buffer(struct pipe_context *,

+                                unsigned index,

+                                const struct pipe_vertex_buffer *);

+

+

+void softpipe_update_derived( struct softpipe_context *softpipe );

+

+

+boolean softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,

+			     unsigned start, unsigned count);

+

+boolean softpipe_draw_elements(struct pipe_context *pipe,

+			       struct pipe_buffer *indexBuffer,

+			       unsigned indexSize,

+			       unsigned mode, unsigned start, unsigned count);

+

+

+void

+softpipe_map_surfaces(struct softpipe_context *sp);

+

+void

+softpipe_unmap_surfaces(struct softpipe_context *sp);

+

+void

+softpipe_map_texture_surfaces(struct softpipe_context *sp);

+

+void

+softpipe_unmap_texture_surfaces(struct softpipe_context *sp);

+

+

+struct vertex_info *

+softpipe_get_vertex_info(struct softpipe_context *softpipe);

+

+struct vertex_info *

+softpipe_get_vbuf_vertex_info(struct softpipe_context *softpipe);

+

+

+#endif

diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c
index 1d6dd17d1d..7cf85b9207 100644
--- a/src/gallium/drivers/softpipe/sp_state_sampler.c
+++ b/src/gallium/drivers/softpipe/sp_state_sampler.c
@@ -50,45 +50,67 @@ softpipe_create_sampler_state(struct pipe_context *pipe,
    return mem_dup(sampler, sizeof(*sampler));
 }
 
+
 void
-softpipe_bind_sampler_state(struct pipe_context *pipe,
-                            unsigned unit, void *sampler)
+softpipe_bind_sampler_states(struct pipe_context *pipe,
+                             unsigned num, void **sampler)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
+   assert(num <= PIPE_MAX_SAMPLERS);
+
+   /* Check for no-op */
+   if (num == softpipe->num_samplers &&
+       !memcmp(softpipe->sampler, sampler, num * sizeof(void *)))
+      return;
+
    draw_flush(softpipe->draw);
 
-   assert(unit < PIPE_MAX_SAMPLERS);
-   softpipe->sampler[unit] = (struct pipe_sampler_state *)sampler;
+   memcpy(softpipe->sampler, sampler, num * sizeof(void *));
+   memset(&softpipe->sampler[num], 0, (PIPE_MAX_SAMPLERS - num) *
+          sizeof(void *));
+
+   softpipe->num_samplers = num;
 
    softpipe->dirty |= SP_NEW_SAMPLER;
 }
 
 
 void
-softpipe_delete_sampler_state(struct pipe_context *pipe,
-                              void *sampler)
+softpipe_set_sampler_textures(struct pipe_context *pipe,
+                              unsigned num, struct pipe_texture **texture)
 {
-   FREE( sampler );
-}
+   struct softpipe_context *softpipe = softpipe_context(pipe);
+   uint i;
 
+   assert(num <= PIPE_MAX_SAMPLERS);
 
-void
-softpipe_set_sampler_texture(struct pipe_context *pipe,
-			     unsigned unit,
-			     struct pipe_texture *texture)
-{
-   struct softpipe_context *softpipe = softpipe_context(pipe);
+   /* Check for no-op */
+   if (num == softpipe->num_textures &&
+       !memcmp(softpipe->texture, texture, num * sizeof(struct pipe_texture *)))
+      return;
 
    draw_flush(softpipe->draw);
 
-   assert(unit < PIPE_MAX_SAMPLERS);
-   pipe_texture_reference(&softpipe->texture[unit], texture);
+   for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
+      struct pipe_texture *tex = i < num ? texture[i] : NULL;
+
+      pipe_texture_reference(&softpipe->texture[i], tex);
+      sp_tile_cache_set_texture(pipe, softpipe->tex_cache[i], tex);
+   }
 
-   sp_tile_cache_set_texture(pipe, softpipe->tex_cache[unit], texture);
+   softpipe->num_textures = num;
 
    softpipe->dirty |= SP_NEW_TEXTURE;
 }
 
 
+void
+softpipe_delete_sampler_state(struct pipe_context *pipe,
+                              void *sampler)
+{
+   FREE( sampler );
+}
+
+
 
diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index c605ed925b..bbf2d80308 100644
--- a/src/gallium/drivers/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
@@ -1,202 +1,202 @@
-/**************************************************************************
- * 
- * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  *   Michel Dänzer <michel@tungstengraphics.com>
-  */
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_inlines.h"
-#include "pipe/p_util.h"
-#include "pipe/p_winsys.h"
-
-#include "sp_context.h"
-#include "sp_state.h"
-#include "sp_texture.h"
-#include "sp_tile_cache.h"
-
-
-/* Simple, maximally packed layout.
- */
-
-static unsigned minify( unsigned d )
-{
-   return MAX2(1, d>>1);
-}
-
-
-static void
-softpipe_texture_layout(struct softpipe_texture * spt)
-{
-   struct pipe_texture *pt = &spt->base;
-   unsigned level;
-   unsigned width = pt->width[0];
-   unsigned height = pt->height[0];
-   unsigned depth = pt->depth[0];
-
-   spt->buffer_size = 0;
-
-   for (level = 0; level <= pt->last_level; level++) {
-      pt->width[level] = width;
-      pt->height[level] = height;
-      pt->depth[level] = depth;
-
-      spt->level_offset[level] = spt->buffer_size;
-
-      spt->buffer_size += ((pt->compressed) ? MAX2(1, height/4) : height) *
-			  ((pt->target == PIPE_TEXTURE_CUBE) ? 6 : depth) *
-			  width * pt->cpp;
-
-      width  = minify(width);
-      height = minify(height);
-      depth = minify(depth);
-   }
-}
-
-
-static struct pipe_texture *
-softpipe_texture_create_screen(struct pipe_screen *screen,
-                               const struct pipe_texture *templat)
-{
-   struct pipe_winsys *ws = screen->winsys;
-   struct softpipe_texture *spt = CALLOC_STRUCT(softpipe_texture);
-   if (!spt)
-      return NULL;
-
-   spt->base = *templat;
-   spt->base.refcount = 1;
-   spt->base.screen = screen;
-
-   softpipe_texture_layout(spt);
-
-   spt->buffer = ws->buffer_create(ws, 32,
-                                   PIPE_BUFFER_USAGE_PIXEL,
-                                   spt->buffer_size);
-   if (!spt->buffer) {
-      FREE(spt);
-      return NULL;
-   }
-
-   assert(spt->base.refcount == 1);
-
-   return &spt->base;
-}
-
-
-static void
-softpipe_texture_release_screen(struct pipe_screen *screen,
-                                struct pipe_texture **pt)
-{
-   if (!*pt)
-      return;
-
-   /*
-   DBG("%s %p refcount will be %d\n",
-       __FUNCTION__, (void *) *pt, (*pt)->refcount - 1);
-   */
-   if (--(*pt)->refcount <= 0) {
-      struct softpipe_texture *spt = softpipe_texture(*pt);
-
-      /*
-      DBG("%s deleting %p\n", __FUNCTION__, (void *) spt);
-      */
-
-      pipe_buffer_reference(screen->winsys, &spt->buffer, NULL);
-
-      FREE(spt);
-   }
-   *pt = NULL;
-}
-
-
-static struct pipe_surface *
-softpipe_get_tex_surface_screen(struct pipe_screen *screen,
-                                struct pipe_texture *pt,
-                                unsigned face, unsigned level, unsigned zslice)
-{
-   struct pipe_winsys *ws = screen->winsys;
-   struct softpipe_texture *spt = softpipe_texture(pt);
-   struct pipe_surface *ps;
-
-   assert(level <= pt->last_level);
-
-   ps = ws->surface_alloc(ws);
-   if (ps) {
-      assert(ps->refcount);
-      assert(ps->winsys);
-      pipe_buffer_reference(ws, &ps->buffer, spt->buffer);
-      ps->format = pt->format;
-      ps->cpp = pt->cpp;
-      ps->width = pt->width[level];
-      ps->height = pt->height[level];
-      ps->pitch = ps->width;
-      ps->offset = spt->level_offset[level];
-
-      if (pt->target == PIPE_TEXTURE_CUBE || pt->target == PIPE_TEXTURE_3D) {
-	 ps->offset += ((pt->target == PIPE_TEXTURE_CUBE) ? face : zslice) *
-		       (pt->compressed ? ps->height/4 : ps->height) *
-		       ps->width * ps->cpp;
-      }
-      else {
-	 assert(face == 0);
-	 assert(zslice == 0);
-      }
-   }
-   return ps;
-}
-
-
-static void
-softpipe_texture_update(struct pipe_context *pipe,
-                        struct pipe_texture *texture)
-{
-   struct softpipe_context *softpipe = softpipe_context(pipe);
-   uint unit;
-   for (unit = 0; unit < PIPE_MAX_SAMPLERS; unit++) {
-      if (softpipe->texture[unit] == texture) {
-         sp_flush_tile_cache(softpipe, softpipe->tex_cache[unit]);
-      }
-   }
-}
-
-
-void
-softpipe_init_texture_funcs( struct softpipe_context *softpipe )
-{
-   softpipe->pipe.texture_update = softpipe_texture_update;
-}
-
-
-void
-softpipe_init_screen_texture_funcs(struct pipe_screen *screen)
-{
-   screen->texture_create = softpipe_texture_create_screen;
-   screen->texture_release = softpipe_texture_release_screen;
-   screen->get_tex_surface = softpipe_get_tex_surface_screen;
-}
+/**************************************************************************

+ * 

+ * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, sub license, and/or sell copies of the Software, and to

+ * permit persons to whom the Software is furnished to do so, subject to

+ * the following conditions:

+ * 

+ * The above copyright notice and this permission notice (including the

+ * next paragraph) shall be included in all copies or substantial portions

+ * of the Software.

+ * 

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ * 

+ **************************************************************************/

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  *   Michel Dänzer <michel@tungstengraphics.com>

+  */

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_inlines.h"

+#include "pipe/p_util.h"

+#include "pipe/p_winsys.h"

+

+#include "sp_context.h"

+#include "sp_state.h"

+#include "sp_texture.h"

+#include "sp_tile_cache.h"

+

+

+/* Simple, maximally packed layout.

+ */

+

+static unsigned minify( unsigned d )

+{

+   return MAX2(1, d>>1);

+}

+

+

+static void

+softpipe_texture_layout(struct softpipe_texture * spt)

+{

+   struct pipe_texture *pt = &spt->base;

+   unsigned level;

+   unsigned width = pt->width[0];

+   unsigned height = pt->height[0];

+   unsigned depth = pt->depth[0];

+

+   spt->buffer_size = 0;

+

+   for (level = 0; level <= pt->last_level; level++) {

+      pt->width[level] = width;

+      pt->height[level] = height;

+      pt->depth[level] = depth;

+

+      spt->level_offset[level] = spt->buffer_size;

+

+      spt->buffer_size += ((pt->compressed) ? MAX2(1, height/4) : height) *

+			  ((pt->target == PIPE_TEXTURE_CUBE) ? 6 : depth) *

+			  width * pt->cpp;

+

+      width  = minify(width);

+      height = minify(height);

+      depth = minify(depth);

+   }

+}

+

+

+static struct pipe_texture *

+softpipe_texture_create_screen(struct pipe_screen *screen,

+                               const struct pipe_texture *templat)

+{

+   struct pipe_winsys *ws = screen->winsys;

+   struct softpipe_texture *spt = CALLOC_STRUCT(softpipe_texture);

+   if (!spt)

+      return NULL;

+

+   spt->base = *templat;

+   spt->base.refcount = 1;

+   spt->base.screen = screen;

+

+   softpipe_texture_layout(spt);

+

+   spt->buffer = ws->buffer_create(ws, 32,

+                                   PIPE_BUFFER_USAGE_PIXEL,

+                                   spt->buffer_size);

+   if (!spt->buffer) {

+      FREE(spt);

+      return NULL;

+   }

+

+   assert(spt->base.refcount == 1);

+

+   return &spt->base;

+}

+

+

+static void

+softpipe_texture_release_screen(struct pipe_screen *screen,

+                                struct pipe_texture **pt)

+{

+   if (!*pt)

+      return;

+

+   /*

+   DBG("%s %p refcount will be %d\n",

+       __FUNCTION__, (void *) *pt, (*pt)->refcount - 1);

+   */

+   if (--(*pt)->refcount <= 0) {

+      struct softpipe_texture *spt = softpipe_texture(*pt);

+

+      /*

+      DBG("%s deleting %p\n", __FUNCTION__, (void *) spt);

+      */

+

+      pipe_buffer_reference(screen->winsys, &spt->buffer, NULL);

+

+      FREE(spt);

+   }

+   *pt = NULL;

+}

+

+

+static struct pipe_surface *

+softpipe_get_tex_surface_screen(struct pipe_screen *screen,

+                                struct pipe_texture *pt,

+                                unsigned face, unsigned level, unsigned zslice)

+{

+   struct pipe_winsys *ws = screen->winsys;

+   struct softpipe_texture *spt = softpipe_texture(pt);

+   struct pipe_surface *ps;

+

+   assert(level <= pt->last_level);

+

+   ps = ws->surface_alloc(ws);

+   if (ps) {

+      assert(ps->refcount);

+      assert(ps->winsys);

+      pipe_buffer_reference(ws, &ps->buffer, spt->buffer);

+      ps->format = pt->format;

+      ps->cpp = pt->cpp;

+      ps->width = pt->width[level];

+      ps->height = pt->height[level];

+      ps->pitch = ps->width;

+      ps->offset = spt->level_offset[level];

+

+      if (pt->target == PIPE_TEXTURE_CUBE || pt->target == PIPE_TEXTURE_3D) {

+	 ps->offset += ((pt->target == PIPE_TEXTURE_CUBE) ? face : zslice) *

+		       (pt->compressed ? ps->height/4 : ps->height) *

+		       ps->width * ps->cpp;

+      }

+      else {

+	 assert(face == 0);

+	 assert(zslice == 0);

+      }

+   }

+   return ps;

+}

+

+

+static void

+softpipe_texture_update(struct pipe_context *pipe,

+                        struct pipe_texture *texture)

+{

+   struct softpipe_context *softpipe = softpipe_context(pipe);

+   uint unit;

+   for (unit = 0; unit < softpipe->num_textures; unit++) {

+      if (softpipe->texture[unit] == texture) {

+         sp_flush_tile_cache(softpipe, softpipe->tex_cache[unit]);

+      }

+   }

+}

+

+

+void

+softpipe_init_texture_funcs( struct softpipe_context *softpipe )

+{

+   softpipe->pipe.texture_update = softpipe_texture_update;

+}

+

+

+void

+softpipe_init_screen_texture_funcs(struct pipe_screen *screen)

+{

+   screen->texture_create = softpipe_texture_create_screen;

+   screen->texture_release = softpipe_texture_release_screen;

+   screen->get_tex_surface = softpipe_get_tex_surface_screen;

+}