gallium: remove DOS carriage returns

1 files changed, 243 insertions, 243 deletions

diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index 316ae552b8e..16fb06f176f 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 <[email protected]>

- */

-

-#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;

-}

+/**************************************************************************
+ * 
+ * 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 <[email protected]>
+ */
+
+#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;
+}