*/
#include "draw/draw_context.h"
+#include "draw/draw_vbuf.h"
#include "pipe/p_defines.h"
#include "util/u_math.h"
#include "util/u_memory.h"
#include "lp_clear.h"
#include "lp_context.h"
#include "lp_flush.h"
-#include "lp_prim_setup.h"
#include "lp_prim_vbuf.h"
#include "lp_state.h"
#include "lp_surface.h"
-#include "lp_tile_cache.h"
#include "lp_texture.h"
#include "lp_winsys.h"
#include "lp_query.h"
+#include "lp_setup.h"
-/**
- * Map any drawing surfaces which aren't already mapped
- */
-void
-llvmpipe_map_transfers(struct llvmpipe_context *lp)
-{
- unsigned i;
-
- for (i = 0; i < lp->framebuffer.nr_cbufs; i++) {
- lp_tile_cache_map_transfers(lp->cbuf_cache[i]);
- }
-
- lp_tile_cache_map_transfers(lp->zsbuf_cache);
-}
-
-
-/**
- * Unmap any mapped drawing surfaces
- */
-void
-llvmpipe_unmap_transfers(struct llvmpipe_context *lp)
-{
- uint i;
-
- for (i = 0; i < lp->framebuffer.nr_cbufs; i++)
- lp_flush_tile_cache(lp->cbuf_cache[i]);
- lp_flush_tile_cache(lp->zsbuf_cache);
-
- for (i = 0; i < lp->framebuffer.nr_cbufs; i++) {
- lp_tile_cache_unmap_transfers(lp->cbuf_cache[i]);
- }
- lp_tile_cache_unmap_transfers(lp->zsbuf_cache);
-}
static void llvmpipe_destroy( struct pipe_context *pipe )
if (llvmpipe->draw)
draw_destroy( llvmpipe->draw );
- 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 );
- llvmpipe->quad[i].alpha_test->destroy( llvmpipe->quad[i].alpha_test );
- llvmpipe->quad[i].depth_test->destroy( llvmpipe->quad[i].depth_test );
- llvmpipe->quad[i].stencil_test->destroy( llvmpipe->quad[i].stencil_test );
- llvmpipe->quad[i].occlusion->destroy( llvmpipe->quad[i].occlusion );
- llvmpipe->quad[i].coverage->destroy( llvmpipe->quad[i].coverage );
- llvmpipe->quad[i].blend->destroy( llvmpipe->quad[i].blend );
- llvmpipe->quad[i].colormask->destroy( llvmpipe->quad[i].colormask );
- llvmpipe->quad[i].output->destroy( llvmpipe->quad[i].output );
+ if (llvmpipe->setup)
+ lp_setup_destroy( llvmpipe->setup );
+
+ for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
+ pipe_surface_reference(&llvmpipe->framebuffer.cbufs[i], NULL);
}
- for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)
- lp_destroy_tile_cache(llvmpipe->cbuf_cache[i]);
- lp_destroy_tile_cache(llvmpipe->zsbuf_cache);
+ pipe_surface_reference(&llvmpipe->framebuffer.zsbuf, NULL);
- for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
- lp_destroy_tile_cache(llvmpipe->tex_cache[i]);
+ for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
+ pipe_texture_reference(&llvmpipe->texture[i], NULL);
+ }
for (i = 0; i < Elements(llvmpipe->constants); i++) {
if (llvmpipe->constants[i].buffer) {
}
}
- FREE( llvmpipe );
+ align_free( llvmpipe );
}
static unsigned int
unsigned face, unsigned level)
{
struct llvmpipe_context *llvmpipe = llvmpipe_context( pipe );
- unsigned i;
- if(llvmpipe->dirty_render_cache) {
- for (i = 0; i < llvmpipe->framebuffer.nr_cbufs; i++) {
- if(llvmpipe->framebuffer.cbufs[i] &&
- llvmpipe->framebuffer.cbufs[i]->texture == texture)
- return PIPE_REFERENCED_FOR_WRITE;
- }
- if(llvmpipe->framebuffer.zsbuf &&
- llvmpipe->framebuffer.zsbuf->texture == texture)
- return PIPE_REFERENCED_FOR_WRITE;
- }
-
- /* FIXME: we also need to do the same for the texture cache */
-
- return PIPE_UNREFERENCED;
+ return lp_setup_is_texture_referenced(llvmpipe->setup, texture);
}
static unsigned int
struct pipe_context *
llvmpipe_create( struct pipe_screen *screen )
{
- struct llvmpipe_context *llvmpipe = CALLOC_STRUCT(llvmpipe_context);
- uint i;
+ struct llvmpipe_context *llvmpipe;
- util_init_math();
+ llvmpipe = align_malloc(sizeof(struct llvmpipe_context), 16);
+ if (!llvmpipe)
+ return NULL;
-#ifdef PIPE_ARCH_X86
- llvmpipe->use_sse = !debug_get_bool_option( "GALLIUM_NOSSE", FALSE );
-#else
- llvmpipe->use_sse = FALSE;
-#endif
+ util_init_math();
- llvmpipe->dump_fs = debug_get_bool_option( "GALLIUM_DUMP_FS", FALSE );
+ memset(llvmpipe, 0, sizeof *llvmpipe);
llvmpipe->pipe.winsys = screen->winsys;
llvmpipe->pipe.screen = screen;
llvmpipe_init_query_funcs( llvmpipe );
llvmpipe_init_texture_funcs( llvmpipe );
- /*
- * Alloc caches for accessing drawing surfaces and textures.
- * Must be before quad stage setup!
- */
- for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)
- llvmpipe->cbuf_cache[i] = lp_create_tile_cache( screen );
- llvmpipe->zsbuf_cache = lp_create_tile_cache( screen );
-
- for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
- llvmpipe->tex_cache[i] = lp_create_tile_cache( screen );
-
-
- /* setup quad rendering stages */
- 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);
- llvmpipe->quad[i].alpha_test = lp_quad_alpha_test_stage(llvmpipe);
- llvmpipe->quad[i].depth_test = lp_quad_depth_test_stage(llvmpipe);
- llvmpipe->quad[i].stencil_test = lp_quad_stencil_test_stage(llvmpipe);
- llvmpipe->quad[i].occlusion = lp_quad_occlusion_stage(llvmpipe);
- llvmpipe->quad[i].coverage = lp_quad_coverage_stage(llvmpipe);
- llvmpipe->quad[i].blend = lp_quad_blend_stage(llvmpipe);
- llvmpipe->quad[i].colormask = lp_quad_colormask_stage(llvmpipe);
- llvmpipe->quad[i].output = lp_quad_output_stage(llvmpipe);
- }
-
- /* vertex shader samplers */
- for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
- llvmpipe->tgsi.vert_samplers[i].base.get_samples = lp_get_samples_vertex;
- llvmpipe->tgsi.vert_samplers[i].cache = llvmpipe->tex_cache[i];
- llvmpipe->tgsi.vert_samplers_list[i] = &llvmpipe->tgsi.vert_samplers[i];
- }
-
- /* fragment shader samplers */
- for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
- llvmpipe->tgsi.frag_samplers[i].base.get_samples = lp_get_samples_fragment;
- llvmpipe->tgsi.frag_samplers[i].cache = llvmpipe->tex_cache[i];
- llvmpipe->tgsi.frag_samplers_list[i] = &llvmpipe->tgsi.frag_samplers[i];
- }
-
/*
* Create drawing context and plug our rendering stage into it.
*/
if (!llvmpipe->draw)
goto fail;
- draw_texture_samplers(llvmpipe->draw,
- PIPE_MAX_SAMPLERS,
- (struct tgsi_sampler **)
- llvmpipe->tgsi.vert_samplers_list);
+ /* FIXME: vertex sampler state
+ */
+
+ if (debug_get_bool_option( "LP_NO_RAST", FALSE ))
+ llvmpipe->no_rast = TRUE;
- llvmpipe->setup = lp_draw_render_stage(llvmpipe);
+ llvmpipe->setup = lp_setup_create();
if (!llvmpipe->setup)
goto fail;
- if (debug_get_bool_option( "LP_NO_RAST", FALSE ))
- llvmpipe->no_rast = TRUE;
+ llvmpipe->vbuf_backend = lp_create_vbuf_backend(llvmpipe);
+ if (!llvmpipe->vbuf_backend)
+ goto fail;
+
+ llvmpipe->vbuf = draw_vbuf_stage(llvmpipe->draw, llvmpipe->vbuf_backend);
+ if (!llvmpipe->vbuf)
+ goto fail;
+
+ draw_set_rasterize_stage(llvmpipe->draw, llvmpipe->vbuf);
+ draw_set_render(llvmpipe->draw, llvmpipe->vbuf_backend);
+
- 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);
- }
- else {
- lp_init_vbuf(llvmpipe);
- }
/* plug in AA line/point stages */
draw_install_aaline_stage(llvmpipe->draw, &llvmpipe->pipe);
projects / mesa.git / blobdiff