diff options
30 files changed, 113 insertions, 113 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_clear.h b/src/gallium/drivers/llvmpipe/lp_clear.h index 781a867946b..6d4ffccdf45 100644 --- a/src/gallium/drivers/llvmpipe/lp_clear.h +++ b/src/gallium/drivers/llvmpipe/lp_clear.h @@ -29,8 +29,8 @@ * Brian Paul */ -#ifndef SP_CLEAR_H -#define SP_CLEAR_H +#ifndef LP_CLEAR_H +#define LP_CLEAR_H #include "pipe/p_state.h" struct pipe_context; @@ -40,4 +40,4 @@ llvmpipe_clear(struct pipe_context *pipe, unsigned buffers, const float *rgba, double depth, unsigned stencil); -#endif /* SP_CLEAR_H */ +#endif /* LP_CLEAR_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c index cad74d3da94..66a6e791931 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.c +++ b/src/gallium/drivers/llvmpipe/lp_context.c @@ -91,7 +91,7 @@ static void llvmpipe_destroy( struct pipe_context *pipe ) if (llvmpipe->draw) draw_destroy( llvmpipe->draw ); - for (i = 0; i < SP_NUM_QUAD_THREADS; i++) { + for (i = 0; i < LP_NUM_QUAD_THREADS; i++) { llvmpipe->quad[i].polygon_stipple->destroy( llvmpipe->quad[i].polygon_stipple ); llvmpipe->quad[i].earlyz->destroy( llvmpipe->quad[i].earlyz ); llvmpipe->quad[i].shade->destroy( llvmpipe->quad[i].shade ); @@ -237,7 +237,7 @@ llvmpipe_create( struct pipe_screen *screen ) /* setup quad rendering stages */ - for (i = 0; i < SP_NUM_QUAD_THREADS; i++) { + for (i = 0; i < LP_NUM_QUAD_THREADS; i++) { llvmpipe->quad[i].polygon_stipple = lp_quad_polygon_stipple_stage(llvmpipe); llvmpipe->quad[i].earlyz = lp_quad_earlyz_stage(llvmpipe); llvmpipe->quad[i].shade = lp_quad_shade_stage(llvmpipe); @@ -285,10 +285,10 @@ llvmpipe_create( struct pipe_screen *screen ) if (!llvmpipe->setup) goto fail; - if (debug_get_bool_option( "SP_NO_RAST", FALSE )) + if (debug_get_bool_option( "LP_NO_RAST", FALSE )) llvmpipe->no_rast = TRUE; - if (debug_get_bool_option( "SP_NO_VBUF", FALSE )) { + if (debug_get_bool_option( "LP_NO_VBUF", FALSE )) { /* Deprecated path -- vbuf is the intended interface to the draw module: */ draw_set_rasterize_stage(llvmpipe->draw, llvmpipe->setup); diff --git a/src/gallium/drivers/llvmpipe/lp_context.h b/src/gallium/drivers/llvmpipe/lp_context.h index 32b1925b77a..9bfae0aa7f8 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.h +++ b/src/gallium/drivers/llvmpipe/lp_context.h @@ -28,8 +28,8 @@ /* Authors: Keith Whitwell <[email protected]> */ -#ifndef SP_CONTEXT_H -#define SP_CONTEXT_H +#ifndef LP_CONTEXT_H +#define LP_CONTEXT_H #include "pipe/p_context.h" @@ -48,7 +48,7 @@ /* Number of threads working on individual quads. * Setting to 1 disables this feature. */ -#define SP_NUM_QUAD_THREADS 1 +#define LP_NUM_QUAD_THREADS 1 struct llvmpipe_vbuf_render; struct draw_context; @@ -86,7 +86,7 @@ struct llvmpipe_context { unsigned num_vertex_elements; unsigned num_vertex_buffers; - unsigned dirty; /**< Mask of SP_NEW_x flags */ + unsigned dirty; /**< Mask of LP_NEW_x flags */ /* Counter for occlusion queries. Note this supports overlapping * queries. @@ -129,7 +129,7 @@ struct llvmpipe_context { struct quad_stage *output; struct quad_stage *first; /**< points to one of the above stages */ - } quad[SP_NUM_QUAD_THREADS]; + } quad[LP_NUM_QUAD_THREADS]; /** TGSI exec things */ struct { @@ -164,5 +164,5 @@ llvmpipe_context( struct pipe_context *pipe ) return (struct llvmpipe_context *)pipe; } -#endif /* SP_CONTEXT_H */ +#endif /* LP_CONTEXT_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_flush.h b/src/gallium/drivers/llvmpipe/lp_flush.h index 787bc5f2b25..10b2b525836 100644 --- a/src/gallium/drivers/llvmpipe/lp_flush.h +++ b/src/gallium/drivers/llvmpipe/lp_flush.h @@ -25,8 +25,8 @@ * **************************************************************************/ -#ifndef SP_FLUSH_H -#define SP_FLUSH_H +#ifndef LP_FLUSH_H +#define LP_FLUSH_H struct pipe_context; struct pipe_fence_handle; diff --git a/src/gallium/drivers/llvmpipe/lp_fs.h b/src/gallium/drivers/llvmpipe/lp_fs.h index 408167075ae..505e21138f5 100644 --- a/src/gallium/drivers/llvmpipe/lp_fs.h +++ b/src/gallium/drivers/llvmpipe/lp_fs.h @@ -28,8 +28,8 @@ /* Authors: Keith Whitwell <[email protected]> */ -#ifndef SP_FS_H -#define SP_FS_H +#ifndef LP_FS_H +#define LP_FS_H struct lp_fragment_shader * llvmpipe_create_fs_exec(struct llvmpipe_context *llvmpipe, diff --git a/src/gallium/drivers/llvmpipe/lp_prim_setup.h b/src/gallium/drivers/llvmpipe/lp_prim_setup.h index 9cd34396608..da6cae63751 100644 --- a/src/gallium/drivers/llvmpipe/lp_prim_setup.h +++ b/src/gallium/drivers/llvmpipe/lp_prim_setup.h @@ -26,8 +26,8 @@ **************************************************************************/ -#ifndef SP_PRIM_SETUP_H -#define SP_PRIM_SETUP_H +#ifndef LP_PRIM_SETUP_H +#define LP_PRIM_SETUP_H /** @@ -82,4 +82,4 @@ lp_draw_vbuf_stage( struct draw_context *draw_context, vbuf_draw_func draw ); -#endif /* SP_PRIM_SETUP_H */ +#endif /* LP_PRIM_SETUP_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_prim_vbuf.c b/src/gallium/drivers/llvmpipe/lp_prim_vbuf.c index e6d9e375a31..5921ed3f96a 100644 --- a/src/gallium/drivers/llvmpipe/lp_prim_vbuf.c +++ b/src/gallium/drivers/llvmpipe/lp_prim_vbuf.c @@ -46,8 +46,8 @@ #include "util/u_memory.h" -#define SP_MAX_VBUF_INDEXES 1024 -#define SP_MAX_VBUF_SIZE 4096 +#define LP_MAX_VBUF_INDEXES 1024 +#define LP_MAX_VBUF_SIZE 4096 typedef const float (*cptrf4)[4]; @@ -562,8 +562,8 @@ lp_init_vbuf(struct llvmpipe_context *lp) lp->vbuf_render = CALLOC_STRUCT(llvmpipe_vbuf_render); - lp->vbuf_render->base.max_indices = SP_MAX_VBUF_INDEXES; - lp->vbuf_render->base.max_vertex_buffer_bytes = SP_MAX_VBUF_SIZE; + lp->vbuf_render->base.max_indices = LP_MAX_VBUF_INDEXES; + lp->vbuf_render->base.max_vertex_buffer_bytes = LP_MAX_VBUF_SIZE; lp->vbuf_render->base.get_vertex_info = lp_vbuf_get_vertex_info; lp->vbuf_render->base.allocate_vertices = lp_vbuf_allocate_vertices; diff --git a/src/gallium/drivers/llvmpipe/lp_prim_vbuf.h b/src/gallium/drivers/llvmpipe/lp_prim_vbuf.h index 6405c584b6d..6c4e6063e6d 100644 --- a/src/gallium/drivers/llvmpipe/lp_prim_vbuf.h +++ b/src/gallium/drivers/llvmpipe/lp_prim_vbuf.h @@ -25,8 +25,8 @@ * **************************************************************************/ -#ifndef SP_VBUF_H -#define SP_VBUF_H +#ifndef LP_VBUF_H +#define LP_VBUF_H struct llvmpipe_context; @@ -35,4 +35,4 @@ extern void lp_init_vbuf(struct llvmpipe_context *llvmpipe); -#endif /* SP_VBUF_H */ +#endif /* LP_VBUF_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_quad.h b/src/gallium/drivers/llvmpipe/lp_quad.h index bd6c6cb9123..f31a74404de 100644 --- a/src/gallium/drivers/llvmpipe/lp_quad.h +++ b/src/gallium/drivers/llvmpipe/lp_quad.h @@ -28,8 +28,8 @@ /* Authors: Keith Whitwell <[email protected]> */ -#ifndef SP_QUAD_H -#define SP_QUAD_H +#ifndef LP_QUAD_H +#define LP_QUAD_H #include "pipe/p_state.h" #include "tgsi/tgsi_exec.h" @@ -103,4 +103,4 @@ struct quad_header { unsigned nr_attrs; }; -#endif /* SP_QUAD_H */ +#endif /* LP_QUAD_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_quad_pipe.c b/src/gallium/drivers/llvmpipe/lp_quad_pipe.c index 378acf8f860..ab202635238 100644 --- a/src/gallium/drivers/llvmpipe/lp_quad_pipe.c +++ b/src/gallium/drivers/llvmpipe/lp_quad_pipe.c @@ -68,7 +68,7 @@ lp_build_quad_pipeline(struct llvmpipe_context *lp) !lp->fs->info.writes_z; /* build up the pipeline in reverse order... */ - for (i = 0; i < SP_NUM_QUAD_THREADS; i++) { + for (i = 0; i < LP_NUM_QUAD_THREADS; i++) { lp->quad[i].first = lp->quad[i].output; if (lp->blend->colormask != 0xf) { diff --git a/src/gallium/drivers/llvmpipe/lp_quad_pipe.h b/src/gallium/drivers/llvmpipe/lp_quad_pipe.h index 5995fdb6c66..4c3efdee69c 100644 --- a/src/gallium/drivers/llvmpipe/lp_quad_pipe.h +++ b/src/gallium/drivers/llvmpipe/lp_quad_pipe.h @@ -28,8 +28,8 @@ /* Authors: Keith Whitwell <[email protected]> */ -#ifndef SP_QUAD_PIPE_H -#define SP_QUAD_PIPE_H +#ifndef LP_QUAD_PIPE_H +#define LP_QUAD_PIPE_H struct llvmpipe_context; @@ -71,4 +71,4 @@ void lp_build_quad_pipeline(struct llvmpipe_context *lp); void lp_depth_test_quad(struct quad_stage *qs, struct quad_header *quad); -#endif /* SP_QUAD_PIPE_H */ +#endif /* LP_QUAD_PIPE_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_query.c b/src/gallium/drivers/llvmpipe/lp_query.c index 7aa8e9d3fea..5554285425d 100644 --- a/src/gallium/drivers/llvmpipe/lp_query.c +++ b/src/gallium/drivers/llvmpipe/lp_query.c @@ -71,7 +71,7 @@ llvmpipe_begin_query(struct pipe_context *pipe, struct pipe_query *q) sq->start = llvmpipe->occlusion_count; llvmpipe->active_query_count++; - llvmpipe->dirty |= SP_NEW_QUERY; + llvmpipe->dirty |= LP_NEW_QUERY; } @@ -83,7 +83,7 @@ llvmpipe_end_query(struct pipe_context *pipe, struct pipe_query *q) llvmpipe->active_query_count--; sq->end = llvmpipe->occlusion_count; - llvmpipe->dirty |= SP_NEW_QUERY; + llvmpipe->dirty |= LP_NEW_QUERY; } diff --git a/src/gallium/drivers/llvmpipe/lp_query.h b/src/gallium/drivers/llvmpipe/lp_query.h index 58eba089d87..fa9fcd87139 100644 --- a/src/gallium/drivers/llvmpipe/lp_query.h +++ b/src/gallium/drivers/llvmpipe/lp_query.h @@ -29,11 +29,11 @@ * Keith Whitwell */ -#ifndef SP_QUERY_H -#define SP_QUERY_H +#ifndef LP_QUERY_H +#define LP_QUERY_H struct llvmpipe_context; extern void llvmpipe_init_query_funcs(struct llvmpipe_context * ); -#endif /* SP_QUERY_H */ +#endif /* LP_QUERY_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_screen.h b/src/gallium/drivers/llvmpipe/lp_screen.h index 9f79510c4d6..7386ebefe64 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.h +++ b/src/gallium/drivers/llvmpipe/lp_screen.h @@ -28,8 +28,8 @@ /* Authors: Keith Whitwell <[email protected]> */ -#ifndef SP_SCREEN_H -#define SP_SCREEN_H +#ifndef LP_SCREEN_H +#define LP_SCREEN_H #include "pipe/p_screen.h" #include "pipe/p_defines.h" @@ -55,4 +55,4 @@ llvmpipe_screen( struct pipe_screen *pipe ) } -#endif /* SP_SCREEN_H */ +#endif /* LP_SCREEN_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c index 1bfe9d4852c..e4cf0a60fa9 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup.c +++ b/src/gallium/drivers/llvmpipe/lp_setup.c @@ -61,7 +61,7 @@ struct edge { int lines; /**< number of lines on this edge */ }; -#if SP_NUM_QUAD_THREADS > 1 +#if LP_NUM_QUAD_THREADS > 1 /* Set to 1 if you want other threads to be instantly * notified of pending jobs. @@ -169,9 +169,9 @@ struct setup_context { struct tgsi_interp_coef posCoef; /* For Z, W */ struct quad_header quad; -#if SP_NUM_QUAD_THREADS > 1 +#if LP_NUM_QUAD_THREADS > 1 struct quad_job_que que; - struct thread_info threads[SP_NUM_QUAD_THREADS]; + struct thread_info threads[LP_NUM_QUAD_THREADS]; #endif struct { @@ -190,7 +190,7 @@ struct setup_context { unsigned winding; /* which winding to cull */ }; -#if SP_NUM_QUAD_THREADS > 1 +#if LP_NUM_QUAD_THREADS > 1 static PIPE_THREAD_ROUTINE( quad_thread, param ) { @@ -323,7 +323,7 @@ clip_emit_quad( struct setup_context *setup, struct quad_header *quad, uint thre } } -#if SP_NUM_QUAD_THREADS > 1 +#if LP_NUM_QUAD_THREADS > 1 static void clip_emit_quad_job( struct setup_context *setup, uint thread, struct quad_job *job ) @@ -373,7 +373,7 @@ emit_quad( struct setup_context *setup, struct quad_header *quad, uint thread ) #endif } -#if SP_NUM_QUAD_THREADS > 1 +#if LP_NUM_QUAD_THREADS > 1 static void emit_quad_job( struct setup_context *setup, uint thread, struct quad_job *job ) @@ -1490,7 +1490,7 @@ void setup_prepare( struct setup_context *setup ) /* Note: nr_attrs is only used for debugging (vertex printing) */ setup->quad.nr_attrs = draw_num_vs_outputs(lp->draw); - for (i = 0; i < SP_NUM_QUAD_THREADS; i++) { + for (i = 0; i < LP_NUM_QUAD_THREADS; i++) { lp->quad[i].first->begin( lp->quad[i].first ); } @@ -1520,7 +1520,7 @@ void setup_destroy_context( struct setup_context *setup ) struct setup_context *setup_create_context( struct llvmpipe_context *llvmpipe ) { struct setup_context *setup = CALLOC_STRUCT(setup_context); -#if SP_NUM_QUAD_THREADS > 1 +#if LP_NUM_QUAD_THREADS > 1 uint i; #endif @@ -1529,7 +1529,7 @@ struct setup_context *setup_create_context( struct llvmpipe_context *llvmpipe ) setup->quad.coef = setup->coef; setup->quad.posCoef = &setup->posCoef; -#if SP_NUM_QUAD_THREADS > 1 +#if LP_NUM_QUAD_THREADS > 1 setup->que.first = 0; setup->que.last = 0; pipe_mutex_init( setup->que.que_mutex ); @@ -1538,7 +1538,7 @@ struct setup_context *setup_create_context( struct llvmpipe_context *llvmpipe ) setup->que.jobs_added = 0; setup->que.jobs_done = 0; pipe_condvar_init( setup->que.que_done_condvar ); - for (i = 0; i < SP_NUM_QUAD_THREADS; i++) { + for (i = 0; i < LP_NUM_QUAD_THREADS; i++) { setup->threads[i].setup = setup; setup->threads[i].id = i; setup->threads[i].handle = pipe_thread_create( quad_thread, &setup->threads[i] ); diff --git a/src/gallium/drivers/llvmpipe/lp_setup.h b/src/gallium/drivers/llvmpipe/lp_setup.h index 0e84dfc615a..f55f7e10205 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup.h +++ b/src/gallium/drivers/llvmpipe/lp_setup.h @@ -24,8 +24,8 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * **************************************************************************/ -#ifndef SP_SETUP_H -#define SP_SETUP_H +#ifndef LP_SETUP_H +#define LP_SETUP_H struct setup_context; struct llvmpipe_context; diff --git a/src/gallium/drivers/llvmpipe/lp_state.h b/src/gallium/drivers/llvmpipe/lp_state.h index 778b3a5a68f..125567b6776 100644 --- a/src/gallium/drivers/llvmpipe/lp_state.h +++ b/src/gallium/drivers/llvmpipe/lp_state.h @@ -28,28 +28,28 @@ /* Authors: Keith Whitwell <[email protected]> */ -#ifndef SP_STATE_H -#define SP_STATE_H +#ifndef LP_STATE_H +#define LP_STATE_H #include "pipe/p_state.h" #include "tgsi/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 +#define LP_NEW_VIEWPORT 0x1 +#define LP_NEW_RASTERIZER 0x2 +#define LP_NEW_FS 0x4 +#define LP_NEW_BLEND 0x8 +#define LP_NEW_CLIP 0x10 +#define LP_NEW_SCISSOR 0x20 +#define LP_NEW_STIPPLE 0x40 +#define LP_NEW_FRAMEBUFFER 0x80 +#define LP_NEW_DEPTH_STENCIL_ALPHA 0x100 +#define LP_NEW_CONSTANTS 0x200 +#define LP_NEW_SAMPLER 0x400 +#define LP_NEW_TEXTURE 0x800 +#define LP_NEW_VERTEX 0x1000 +#define LP_NEW_VS 0x2000 +#define LP_NEW_QUERY 0x4000 struct tgsi_sampler; diff --git a/src/gallium/drivers/llvmpipe/lp_state_blend.c b/src/gallium/drivers/llvmpipe/lp_state_blend.c index 420615bd5be..041a54f13e2 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_blend.c +++ b/src/gallium/drivers/llvmpipe/lp_state_blend.c @@ -47,7 +47,7 @@ void llvmpipe_bind_blend_state( struct pipe_context *pipe, llvmpipe->blend = (const struct pipe_blend_state *)blend; - llvmpipe->dirty |= SP_NEW_BLEND; + llvmpipe->dirty |= LP_NEW_BLEND; } void llvmpipe_delete_blend_state(struct pipe_context *pipe, @@ -64,7 +64,7 @@ void llvmpipe_set_blend_color( struct pipe_context *pipe, llvmpipe->blend_color = *blend_color; - llvmpipe->dirty |= SP_NEW_BLEND; + llvmpipe->dirty |= LP_NEW_BLEND; } @@ -88,7 +88,7 @@ llvmpipe_bind_depth_stencil_state(struct pipe_context *pipe, llvmpipe->depth_stencil = (const struct pipe_depth_stencil_alpha_state *)depth_stencil; - llvmpipe->dirty |= SP_NEW_DEPTH_STENCIL_ALPHA; + llvmpipe->dirty |= LP_NEW_DEPTH_STENCIL_ALPHA; } void diff --git a/src/gallium/drivers/llvmpipe/lp_state_clip.c b/src/gallium/drivers/llvmpipe/lp_state_clip.c index b5408f787df..df68f27acc9 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_clip.c +++ b/src/gallium/drivers/llvmpipe/lp_state_clip.c @@ -51,7 +51,7 @@ void llvmpipe_set_viewport_state( struct pipe_context *pipe, draw_set_viewport_state(llvmpipe->draw, viewport); llvmpipe->viewport = *viewport; /* struct copy */ - llvmpipe->dirty |= SP_NEW_VIEWPORT; + llvmpipe->dirty |= LP_NEW_VIEWPORT; } @@ -63,7 +63,7 @@ void llvmpipe_set_scissor_state( struct pipe_context *pipe, draw_flush(llvmpipe->draw); llvmpipe->scissor = *scissor; /* struct copy */ - llvmpipe->dirty |= SP_NEW_SCISSOR; + llvmpipe->dirty |= LP_NEW_SCISSOR; } @@ -75,5 +75,5 @@ void llvmpipe_set_polygon_stipple( struct pipe_context *pipe, draw_flush(llvmpipe->draw); llvmpipe->poly_stipple = *stipple; /* struct copy */ - llvmpipe->dirty |= SP_NEW_STIPPLE; + llvmpipe->dirty |= LP_NEW_STIPPLE; } diff --git a/src/gallium/drivers/llvmpipe/lp_state_derived.c b/src/gallium/drivers/llvmpipe/lp_state_derived.c index 3fd3c4078b2..05a3a0495b4 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_derived.c +++ b/src/gallium/drivers/llvmpipe/lp_state_derived.c @@ -189,22 +189,22 @@ compute_cliprect(struct llvmpipe_context *lp) */ void llvmpipe_update_derived( struct llvmpipe_context *llvmpipe ) { - if (llvmpipe->dirty & (SP_NEW_RASTERIZER | - SP_NEW_FS | - SP_NEW_VS)) + if (llvmpipe->dirty & (LP_NEW_RASTERIZER | + LP_NEW_FS | + LP_NEW_VS)) invalidate_vertex_layout( llvmpipe ); - if (llvmpipe->dirty & (SP_NEW_SCISSOR | - SP_NEW_DEPTH_STENCIL_ALPHA | - SP_NEW_FRAMEBUFFER)) + if (llvmpipe->dirty & (LP_NEW_SCISSOR | + LP_NEW_DEPTH_STENCIL_ALPHA | + LP_NEW_FRAMEBUFFER)) compute_cliprect(llvmpipe); - if (llvmpipe->dirty & (SP_NEW_BLEND | - SP_NEW_DEPTH_STENCIL_ALPHA | - SP_NEW_FRAMEBUFFER | - SP_NEW_RASTERIZER | - SP_NEW_FS | - SP_NEW_QUERY)) + if (llvmpipe->dirty & (LP_NEW_BLEND | + LP_NEW_DEPTH_STENCIL_ALPHA | + LP_NEW_FRAMEBUFFER | + LP_NEW_RASTERIZER | + LP_NEW_FS | + LP_NEW_QUERY)) lp_build_quad_pipeline(llvmpipe); llvmpipe->dirty = 0; diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index dcc73f44e81..1dc0dadef68 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -75,7 +75,7 @@ llvmpipe_bind_fs_state(struct pipe_context *pipe, void *fs) llvmpipe->fs = (struct lp_fragment_shader *) fs; - llvmpipe->dirty |= SP_NEW_FS; + llvmpipe->dirty |= LP_NEW_FS; } @@ -133,7 +133,7 @@ llvmpipe_bind_vs_state(struct pipe_context *pipe, void *vs) draw_bind_vertex_shader(llvmpipe->draw, (llvmpipe->vs ? llvmpipe->vs->draw_data : NULL)); - llvmpipe->dirty |= SP_NEW_VS; + llvmpipe->dirty |= LP_NEW_VS; } @@ -165,5 +165,5 @@ llvmpipe_set_constant_buffer(struct pipe_context *pipe, pipe_buffer_reference(&llvmpipe->constants[shader].buffer, buf ? buf->buffer : NULL); - llvmpipe->dirty |= SP_NEW_CONSTANTS; + llvmpipe->dirty |= LP_NEW_CONSTANTS; } diff --git a/src/gallium/drivers/llvmpipe/lp_state_rasterizer.c b/src/gallium/drivers/llvmpipe/lp_state_rasterizer.c index 9e38606b146..4561c6b8456 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_rasterizer.c +++ b/src/gallium/drivers/llvmpipe/lp_state_rasterizer.c @@ -50,7 +50,7 @@ void llvmpipe_bind_rasterizer_state(struct pipe_context *pipe, llvmpipe->rasterizer = (struct pipe_rasterizer_state *)setup; - llvmpipe->dirty |= SP_NEW_RASTERIZER; + llvmpipe->dirty |= LP_NEW_RASTERIZER; } void llvmpipe_delete_rasterizer_state(struct pipe_context *pipe, diff --git a/src/gallium/drivers/llvmpipe/lp_state_sampler.c b/src/gallium/drivers/llvmpipe/lp_state_sampler.c index 790c12302f3..3a0497fad22 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_sampler.c +++ b/src/gallium/drivers/llvmpipe/lp_state_sampler.c @@ -73,7 +73,7 @@ llvmpipe_bind_sampler_states(struct pipe_context *pipe, llvmpipe->num_samplers = num; - llvmpipe->dirty |= SP_NEW_SAMPLER; + llvmpipe->dirty |= LP_NEW_SAMPLER; } @@ -102,7 +102,7 @@ llvmpipe_set_sampler_textures(struct pipe_context *pipe, llvmpipe->num_textures = num; - llvmpipe->dirty |= SP_NEW_TEXTURE; + llvmpipe->dirty |= LP_NEW_TEXTURE; } diff --git a/src/gallium/drivers/llvmpipe/lp_state_surface.c b/src/gallium/drivers/llvmpipe/lp_state_surface.c index d71e1a7ebb1..f1a3e6ae471 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_surface.c +++ b/src/gallium/drivers/llvmpipe/lp_state_surface.c @@ -125,5 +125,5 @@ llvmpipe_set_framebuffer_state(struct pipe_context *pipe, lp->framebuffer.width = fb->width; lp->framebuffer.height = fb->height; - lp->dirty |= SP_NEW_FRAMEBUFFER; + lp->dirty |= LP_NEW_FRAMEBUFFER; } diff --git a/src/gallium/drivers/llvmpipe/lp_state_vertex.c b/src/gallium/drivers/llvmpipe/lp_state_vertex.c index 68c0e94ab66..1a17631a4c6 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_vertex.c +++ b/src/gallium/drivers/llvmpipe/lp_state_vertex.c @@ -49,7 +49,7 @@ llvmpipe_set_vertex_elements(struct pipe_context *pipe, count * sizeof(struct pipe_vertex_element)); llvmpipe->num_vertex_elements = count; - llvmpipe->dirty |= SP_NEW_VERTEX; + llvmpipe->dirty |= LP_NEW_VERTEX; draw_set_vertex_elements(llvmpipe->draw, count, attribs); } @@ -67,7 +67,7 @@ llvmpipe_set_vertex_buffers(struct pipe_context *pipe, memcpy(llvmpipe->vertex_buffer, buffers, count * sizeof(buffers[0])); llvmpipe->num_vertex_buffers = count; - llvmpipe->dirty |= SP_NEW_VERTEX; + llvmpipe->dirty |= LP_NEW_VERTEX; draw_set_vertex_buffers(llvmpipe->draw, count, buffers); } diff --git a/src/gallium/drivers/llvmpipe/lp_surface.h b/src/gallium/drivers/llvmpipe/lp_surface.h index 8ed8f553aab..4d78a53c4f5 100644 --- a/src/gallium/drivers/llvmpipe/lp_surface.h +++ b/src/gallium/drivers/llvmpipe/lp_surface.h @@ -28,8 +28,8 @@ /* Authors: Keith Whitwell <[email protected]> */ -#ifndef SP_SURFACE_H -#define SP_SURFACE_H +#ifndef LP_SURFACE_H +#define LP_SURFACE_H struct llvmpipe_context; @@ -39,4 +39,4 @@ extern void lp_init_surface_functions(struct llvmpipe_context *lp); -#endif /* SP_SURFACE_H */ +#endif /* LP_SURFACE_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_tex_sample.h b/src/gallium/drivers/llvmpipe/lp_tex_sample.h index 3cf292dcbda..8d380b6e285 100644 --- a/src/gallium/drivers/llvmpipe/lp_tex_sample.h +++ b/src/gallium/drivers/llvmpipe/lp_tex_sample.h @@ -25,8 +25,8 @@ * **************************************************************************/ -#ifndef SP_TEX_SAMPLE_H -#define SP_TEX_SAMPLE_H +#ifndef LP_TEX_SAMPLE_H +#define LP_TEX_SAMPLE_H #include "tgsi/tgsi_exec.h" @@ -70,4 +70,4 @@ lp_get_samples_vertex(struct tgsi_sampler *tgsi_sampler, float rgba[NUM_CHANNELS][QUAD_SIZE]); -#endif /* SP_TEX_SAMPLE_H */ +#endif /* LP_TEX_SAMPLE_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_texture.h b/src/gallium/drivers/llvmpipe/lp_texture.h index 23b37c61c7c..dc688b238dd 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.h +++ b/src/gallium/drivers/llvmpipe/lp_texture.h @@ -25,8 +25,8 @@ * **************************************************************************/ -#ifndef SP_TEXTURE_H -#define SP_TEXTURE_H +#ifndef LP_TEXTURE_H +#define LP_TEXTURE_H #include "pipe/p_state.h" @@ -80,4 +80,4 @@ extern void llvmpipe_init_screen_texture_funcs(struct pipe_screen *screen); -#endif /* SP_TEXTURE */ +#endif /* LP_TEXTURE */ diff --git a/src/gallium/drivers/llvmpipe/lp_tile_cache.h b/src/gallium/drivers/llvmpipe/lp_tile_cache.h index ac3b17cce32..91e14668134 100644 --- a/src/gallium/drivers/llvmpipe/lp_tile_cache.h +++ b/src/gallium/drivers/llvmpipe/lp_tile_cache.h @@ -25,8 +25,8 @@ * **************************************************************************/ -#ifndef SP_TILE_CACHE_H -#define SP_TILE_CACHE_H +#ifndef LP_TILE_CACHE_H +#define LP_TILE_CACHE_H #define TILE_CLEAR_OPTIMIZATION 1 @@ -102,5 +102,5 @@ lp_get_cached_tile_tex(struct llvmpipe_context *llvmpipe, int face, int level); -#endif /* SP_TILE_CACHE_H */ +#endif /* LP_TILE_CACHE_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_winsys.h b/src/gallium/drivers/llvmpipe/lp_winsys.h index ec371c00db6..268336b6903 100644 --- a/src/gallium/drivers/llvmpipe/lp_winsys.h +++ b/src/gallium/drivers/llvmpipe/lp_winsys.h @@ -31,8 +31,8 @@ */ -#ifndef SP_WINSYS_H -#define SP_WINSYS_H +#ifndef LP_WINSYS_H +#define LP_WINSYS_H #ifdef __cplusplus @@ -62,4 +62,4 @@ llvmpipe_get_texture_buffer( struct pipe_texture *texture, } #endif -#endif /* SP_WINSYS_H */ +#endif /* LP_WINSYS_H */ |