Code reorganization: move files into their places.

This is in a separate commit to ensure renames are properly preserved.

1 files changed, 0 insertions, 152 deletions

diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
deleted file mode 100644
index aff8c2cc5dc..00000000000
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/**************************************************************************
- * 
- * 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 <[email protected]>
- */
-
-#ifndef SP_CONTEXT_H
-#define SP_CONTEXT_H
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-
-#include "pipe/draw/draw_vertex.h"
-
-#include "sp_quad.h"
-
-
-struct softpipe_winsys;
-struct softpipe_vbuf_render;
-struct draw_context;
-struct draw_stage;
-struct softpipe_tile_cache;
-struct sp_fragment_shader_state;
-struct sp_vertex_shader_state;
-
-
-struct softpipe_context {
-   struct pipe_context pipe;  /**< base class */
-   struct softpipe_winsys *winsys;	/**< window system interface */
-
-
-   /* The most recent drawing state as set by the driver:
-    */
-   const struct pipe_blend_state   *blend;
-   const struct pipe_sampler_state *sampler[PIPE_MAX_SAMPLERS];
-   const struct pipe_depth_stencil_alpha_state   *depth_stencil;
-   const struct pipe_rasterizer_state *rasterizer;
-   const struct sp_fragment_shader_state *fs;
-   const struct sp_vertex_shader_state *vs;
-
-   struct pipe_blend_color blend_color;
-   struct pipe_clip_state clip;
-   struct pipe_constant_buffer constants[2];
-   struct pipe_framebuffer_state framebuffer;
-   struct pipe_poly_stipple poly_stipple;
-   struct pipe_scissor_state scissor;
-   struct softpipe_texture *texture[PIPE_MAX_SAMPLERS];
-   struct pipe_viewport_state viewport;
-   struct pipe_vertex_buffer vertex_buffer[PIPE_ATTRIB_MAX];
-   struct pipe_vertex_element vertex_element[PIPE_ATTRIB_MAX];
-   unsigned dirty;
-
-   /* Counter for occlusion queries.  Note this supports overlapping
-    * queries.
-    */
-   uint64 occlusion_count;
-
-   /*
-    * Mapped vertex buffers
-    */
-   ubyte *mapped_vbuffer[PIPE_ATTRIB_MAX];
-   
-   /** Mapped constant buffers */
-   void *mapped_constants[PIPE_SHADER_TYPES];
-
-   /** Vertex format */
-   struct vertex_info vertex_info;
-   struct vertex_info vertex_info_vbuf;
-
-   int psize_slot;
-
-#if 0
-   /* Stipple derived state:
-    */
-   ubyte stipple_masks[16][16];
-#endif
-
-   /** Derived from scissor and surface bounds: */
-   struct pipe_scissor_state cliprect;
-
-   unsigned line_stipple_counter;
-
-   /** Software quad rendering pipeline */
-   struct {
-      struct quad_stage *polygon_stipple;
-      struct quad_stage *earlyz;
-      struct quad_stage *shade;
-      struct quad_stage *alpha_test;
-      struct quad_stage *stencil_test;
-      struct quad_stage *depth_test;
-      struct quad_stage *occlusion;
-      struct quad_stage *coverage;
-      struct quad_stage *bufloop;
-      struct quad_stage *blend;
-      struct quad_stage *colormask;
-      struct quad_stage *output;
-
-      struct quad_stage *first; /**< points to one of the above stages */
-   } quad;
-
-   /** The primitive drawing context */
-   struct draw_context *draw;
-   struct draw_stage *setup;
-   struct draw_stage *vbuf;
-   struct softpipe_vbuf_render *vbuf_render;
-
-   uint current_cbuf;      /**< current color buffer being written to */
-
-   struct softpipe_tile_cache *cbuf_cache[PIPE_MAX_COLOR_BUFS];
-   struct softpipe_tile_cache *zsbuf_cache;
-
-   struct softpipe_tile_cache *tex_cache[PIPE_MAX_SAMPLERS];
-
-   int use_sse : 1;
-   int dump_fs : 1;
-};
-
-
-
-
-static INLINE struct softpipe_context *
-softpipe_context( struct pipe_context *pipe )
-{
-   return (struct softpipe_context *)pipe;
-}
-
-
-#endif /* SP_CONTEXT_H */