Renamed softpipe directories and files to something less confusing.

softpipe/state_tracker --> state_tracker/
softpipe/              --> pipe/
softpipe/generic       --> pipe/softpipe/

I don't think pipe is a great name, but I disliked all the others too.
Luckily it's fairly easy to rename with git, so this can be revisited
later.

1 files changed, 184 insertions, 0 deletions

diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
new file mode 100644
index 00000000000..150fa9fcadb
--- /dev/null
+++ b/src/mesa/pipe/p_state.h
@@ -0,0 +1,184 @@
+/**************************************************************************
+ * 
+ * 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.
+ * 
+ **************************************************************************/
+
+#ifndef SP_STATE_H
+#define SP_STATE_H
+
+#include "mtypes.h"
+#include "vf/vf.h"
+
+#define WINDING_NONE 0
+#define WINDING_CW   1
+#define WINDING_CCW  2
+#define WINDING_BOTH (WINDING_CW | WINDING_CCW)
+
+#define FILL_POINT 1
+#define FILL_LINE  2
+#define FILL_TRI   3
+
+struct softpipe_setup_state {
+   GLuint flatshade:1;
+   GLuint light_twoside:1;
+
+   GLuint front_winding:2;
+
+   GLuint cull_mode:2;
+
+   GLuint fill_cw:2;
+   GLuint fill_ccw:2;
+
+   GLuint offset_cw:1;
+   GLuint offset_ccw:1;
+
+   GLuint scissor:1;
+   GLuint poly_stipple:1;
+
+   GLuint pad:18;
+
+   GLfloat offset_units;
+   GLfloat offset_scale;
+};
+
+struct softpipe_poly_stipple {
+   GLuint stipple[32];
+};
+
+
+struct softpipe_viewport {
+   GLfloat scale[4];
+   GLfloat translate[4];
+};
+
+struct softpipe_scissor_rect {
+   GLshort minx;
+   GLshort miny;
+   GLshort maxx;
+   GLshort maxy;
+};
+
+
+#define SP_MAX_CLIP_PLANES 6
+
+struct softpipe_clip_state {
+   GLfloat ucp[SP_MAX_CLIP_PLANES][4];
+   GLuint nr;
+};
+
+struct softpipe_fs_state {
+   struct gl_fragment_program *fp;
+};
+
+#define SP_MAX_CONSTANT 32
+
+struct softpipe_constant_buffer {
+   GLfloat constant[SP_MAX_CONSTANT][4];
+   GLuint nr_constants;
+};
+
+
+struct softpipe_depth_state
+{
+   GLuint enabled:1;   /**< depth test enabled? */
+   GLuint writemask:1; /**< allow depth buffer writes? */
+   GLuint func:3;      /**< depth test func */
+   GLfloat clear;      /**< Clear value in [0,1] (XXX correct place?) */
+};
+
+
+struct softpipe_blend_state {   
+   GLuint blend_enable:1; 
+
+   GLuint rgb_func:3; 
+   GLuint rgb_src_factor:5; 
+   GLuint rgb_dst_factor:5; 
+
+   GLuint alpha_func:3;
+   GLuint alpha_src_factor:5;
+   GLuint alpha_dst_factor:5;
+
+   GLuint logicop_enable:1; 
+   GLuint logicop_func:4;
+};
+
+struct softpipe_blend_color {
+   GLfloat color[4];  
+};
+
+
+struct softpipe_stencil_state {
+   GLuint front_enabled:1;
+   GLuint front_func:3;     /**< SP_STENCIL_FUNC_x */
+   GLuint front_fail_op:3;  /**< SP_STENCIL_OP_x */
+   GLuint front_zpass_op:3; /**< SP_STENCIL_OP_x */
+   GLuint front_zfail_op:3; /**< SP_STENCIL_OP_x */
+   GLuint back_enabled:1;
+   GLuint back_func:3;
+   GLuint back_fail_op:3;
+   GLuint back_zpass_op:3;
+   GLuint back_zfail_op:3;
+   GLubyte ref_value[2];      /**< [0] = front, [1] = back */
+   GLubyte value_mask[2];
+   GLubyte write_mask[2];
+   GLubyte clear_value;
+};
+
+
+/* This will change for hardware softpipes...
+ */
+struct softpipe_surface {
+   GLubyte *ptr;
+   GLint stride;
+   GLuint cpp;
+   GLuint format;
+};
+
+
+/**
+ * Texture sampler state.
+ */
+struct softpipe_sampler_state
+{
+   GLuint wrap_s:3;        /**< SP_TEX_WRAP_x */
+   GLuint wrap_t:3;        /**< SP_TEX_WRAP_x */
+   GLuint wrap_r:3;        /**< SP_TEX_WRAP_x */
+   GLuint min_filter:3;    /**< SP_TEX_FILTER_x */
+   GLuint mag_filter:1;    /**< SP_TEX_FILTER_LINEAR or _NEAREST */
+   GLfloat min_lod;
+   GLfloat max_lod;
+   GLfloat lod_bias;
+#if 0 /* need these? */
+   GLint BaseLevel;     /**< min mipmap level, OpenGL 1.2 */
+   GLint MaxLevel;      /**< max mipmap level, OpenGL 1.2 */
+#endif
+   GLfloat max_anisotropy;
+   GLuint compare:1;       /**< shadow/depth compare enabled? */
+   GLenum compare_mode:1;  /**< SP_TEX_COMPARE_x */
+   GLenum compare_func:3;  /**< SP_DEPTH_FUNC_x */
+   GLfloat shadow_ambient; /**< shadow test fail color/intensity */
+};
+
+#endif