1 files changed, 1 insertions, 53 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_state.h b/src/gallium/drivers/llvmpipe/lp_state.h
index bae5de0cb3..c268f96647 100644
--- a/src/gallium/drivers/llvmpipe/lp_state.h
+++ b/src/gallium/drivers/llvmpipe/lp_state.h
@@ -32,10 +32,9 @@
 #define LP_STATE_H
 
 #include "pipe/p_state.h"
-#include "tgsi/tgsi_scan.h"
 #include "lp_jit.h"
+#include "lp_state_fs.h"
 #include "gallivm/lp_bld.h"
-#include "gallivm/lp_bld_sample.h" /* for struct lp_sampler_static_state */
 
 
 #define LP_NEW_VIEWPORT      0x1
@@ -60,57 +59,6 @@ struct vertex_info;
 struct pipe_context;
 struct llvmpipe_context;
 
-struct lp_fragment_shader;
-
-
-/** Indexes into jit_function[] array */
-#define RAST_WHOLE 0
-#define RAST_EDGE_TEST 1
-
-
-struct lp_fragment_shader_variant_key
-{
-   struct pipe_depth_state depth;
-   struct pipe_stencil_state stencil[2];
-   struct pipe_alpha_state alpha;
-   struct pipe_blend_state blend;
-   enum pipe_format zsbuf_format;
-   unsigned nr_cbufs:8;
-   unsigned flatshade:1;
-   unsigned scissor:1;
-   unsigned occlusion_count:1;
-
-   struct {
-      ubyte colormask;
-   } cbuf_blend[PIPE_MAX_COLOR_BUFS];
-   
-   struct lp_sampler_static_state sampler[PIPE_MAX_SAMPLERS];
-};
-
-
-struct lp_fragment_shader_variant
-{
-   struct lp_fragment_shader_variant_key key;
-
-   boolean opaque;
-
-   LLVMValueRef function[2];
-
-   lp_jit_frag_func jit_function[2];
-
-   struct lp_fragment_shader_variant *next;
-};
-
-
-/** Subclass of pipe_shader_state */
-struct lp_fragment_shader
-{
-   struct pipe_shader_state base;
-
-   struct tgsi_shader_info info;
-
-   struct lp_fragment_shader_variant *variants;
-};
 
 
 /** Subclass of pipe_shader_state */