X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2Flp_rast_priv.h;h=fe078d5b8698a7b7bcb586abc651d634ec68f407;hb=01ab218bbc5c8058a99077a6bc3dc9884e9d218a;hp=bc361b6f1b9fd85db94d6074ffa2f750876b9816;hpb=0319ea9ff6a9cc2eba4879fbe09c6fac137d6ce1;p=mesa.git diff --git a/src/gallium/drivers/llvmpipe/lp_rast_priv.h b/src/gallium/drivers/llvmpipe/lp_rast_priv.h index bc361b6f1b9..fe078d5b869 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast_priv.h +++ b/src/gallium/drivers/llvmpipe/lp_rast_priv.h @@ -28,8 +28,8 @@ #ifndef LP_RAST_PRIV_H #define LP_RAST_PRIV_H -#include "os/os_thread.h" #include "util/u_format.h" +#include "util/u_thread.h" #include "gallivm/lp_bld_debug.h" #include "lp_memory.h" #include "lp_rast.h" @@ -127,10 +127,10 @@ struct lp_rasterizer struct lp_rasterizer_task tasks[LP_MAX_THREADS]; unsigned num_threads; - pipe_thread threads[LP_MAX_THREADS]; + thrd_t threads[LP_MAX_THREADS]; /** For synchronizing the rasterization threads */ - pipe_barrier barrier; + util_barrier barrier; }; @@ -141,72 +141,16 @@ lp_rast_shade_quads_mask(struct lp_rasterizer_task *task, unsigned mask); - /** - * Get pointer to the unswizzled color tile - */ -static INLINE uint8_t * -lp_rast_get_unswizzled_color_tile_pointer(struct lp_rasterizer_task *task, - unsigned buf, enum lp_texture_usage usage) -{ - const struct lp_scene *scene = task->scene; - unsigned format_bytes; - - assert(task->x < scene->tiles_x * TILE_SIZE); - assert(task->y < scene->tiles_y * TILE_SIZE); - assert(task->x % TILE_SIZE == 0); - assert(task->y % TILE_SIZE == 0); - assert(buf < scene->fb.nr_cbufs); - - if (!task->color_tiles[buf]) { - struct pipe_surface *cbuf = scene->fb.cbufs[buf]; - assert(cbuf); - - format_bytes = util_format_get_blocksize(cbuf->format); - task->color_tiles[buf] = scene->cbufs[buf].map + scene->cbufs[buf].stride * task->y + format_bytes * task->x; - } - - return task->color_tiles[buf]; -} - - -/** - * Get pointer to the unswizzled depth tile - */ -static INLINE uint8_t * -lp_rast_get_unswizzled_depth_tile_pointer(struct lp_rasterizer_task *task, - enum lp_texture_usage usage) -{ - const struct lp_scene *scene = task->scene; - unsigned format_bytes; - - assert(task->x < scene->tiles_x * TILE_SIZE); - assert(task->y < scene->tiles_y * TILE_SIZE); - assert(task->x % TILE_SIZE == 0); - assert(task->y % TILE_SIZE == 0); - - if (!task->depth_tile) { - struct pipe_surface *dbuf = scene->fb.zsbuf; - assert(dbuf); - - format_bytes = util_format_get_blocksize(dbuf->format); - task->depth_tile = scene->zsbuf.map + scene->zsbuf.stride * task->y + format_bytes * task->x; - } - - return task->depth_tile; -} - - -/** - * Get the pointer to an unswizzled 4x4 color block (within an unswizzled 64x64 tile). + * Get the pointer to a 4x4 color block (within a 64x64 tile). * \param x, y location of 4x4 block in window coords */ -static INLINE uint8_t * -lp_rast_get_unswizzled_color_block_pointer(struct lp_rasterizer_task *task, - unsigned buf, unsigned x, unsigned y, - unsigned layer) +static inline uint8_t * +lp_rast_get_color_block_pointer(struct lp_rasterizer_task *task, + unsigned buf, unsigned x, unsigned y, + unsigned layer) { - unsigned px, py, pixel_offset, format_bytes; + unsigned px, py, pixel_offset; uint8_t *color; assert(x < task->scene->tiles_x * TILE_SIZE); @@ -215,16 +159,19 @@ lp_rast_get_unswizzled_color_block_pointer(struct lp_rasterizer_task *task, assert((y % TILE_VECTOR_HEIGHT) == 0); assert(buf < task->scene->fb.nr_cbufs); - format_bytes = util_format_get_blocksize(task->scene->fb.cbufs[buf]->format); - - color = lp_rast_get_unswizzled_color_tile_pointer(task, buf, LP_TEX_USAGE_READ_WRITE); - assert(color); + assert(task->color_tiles[buf]); + /* + * We don't actually benefit from having per tile cbuf/zsbuf pointers, + * it's just extra work - the mul/add would be exactly the same anyway. + * Fortunately the extra work (modulo) here is very cheap at least... + */ px = x % TILE_SIZE; py = y % TILE_SIZE; - pixel_offset = px * format_bytes + py * task->scene->cbufs[buf].stride; - color = color + pixel_offset; + pixel_offset = px * task->scene->cbufs[buf].format_bytes + + py * task->scene->cbufs[buf].stride; + color = task->color_tiles[buf] + pixel_offset; if (layer) { color += layer * task->scene->cbufs[buf].layer_stride; @@ -236,14 +183,14 @@ lp_rast_get_unswizzled_color_block_pointer(struct lp_rasterizer_task *task, /** - * Get the pointer to an unswizzled 4x4 depth block (within an unswizzled 64x64 tile). + * Get the pointer to a 4x4 depth block (within a 64x64 tile). * \param x, y location of 4x4 block in window coords */ -static INLINE uint8_t * -lp_rast_get_unswizzled_depth_block_pointer(struct lp_rasterizer_task *task, - unsigned x, unsigned y, unsigned layer) +static inline uint8_t * +lp_rast_get_depth_block_pointer(struct lp_rasterizer_task *task, + unsigned x, unsigned y, unsigned layer) { - unsigned px, py, pixel_offset, format_bytes; + unsigned px, py, pixel_offset; uint8_t *depth; assert(x < task->scene->tiles_x * TILE_SIZE); @@ -251,16 +198,14 @@ lp_rast_get_unswizzled_depth_block_pointer(struct lp_rasterizer_task *task, assert((x % TILE_VECTOR_WIDTH) == 0); assert((y % TILE_VECTOR_HEIGHT) == 0); - format_bytes = util_format_get_blocksize(task->scene->fb.zsbuf->format); - - depth = lp_rast_get_unswizzled_depth_tile_pointer(task, LP_TEX_USAGE_READ_WRITE); - assert(depth); + assert(task->depth_tile); px = x % TILE_SIZE; py = y % TILE_SIZE; - pixel_offset = px * format_bytes + py * task->scene->zsbuf.stride; - depth = depth + pixel_offset; + pixel_offset = px * task->scene->zsbuf.format_bytes + + py * task->scene->zsbuf.stride; + depth = task->depth_tile + pixel_offset; if (layer) { depth += layer * task->scene->zsbuf.layer_stride; @@ -277,7 +222,7 @@ lp_rast_get_unswizzled_depth_block_pointer(struct lp_rasterizer_task *task, * triangle in/out tests. * \param x, y location of 4x4 block in window coords */ -static INLINE void +static inline void lp_rast_shade_quads_all( struct lp_rasterizer_task *task, const struct lp_rast_shader_inputs *inputs, unsigned x, unsigned y ) @@ -293,12 +238,19 @@ lp_rast_shade_quads_all( struct lp_rasterizer_task *task, /* color buffer */ for (i = 0; i < scene->fb.nr_cbufs; i++) { - stride[i] = scene->cbufs[i].stride; - color[i] = lp_rast_get_unswizzled_color_block_pointer(task, i, x, y, inputs->layer); + if (scene->fb.cbufs[i]) { + stride[i] = scene->cbufs[i].stride; + color[i] = lp_rast_get_color_block_pointer(task, i, x, y, + inputs->layer); + } + else { + stride[i] = 0; + color[i] = NULL; + } } if (scene->zsbuf.map) { - depth = lp_rast_get_unswizzled_depth_block_pointer(task, x, y, inputs->layer); + depth = lp_rast_get_depth_block_pointer(task, x, y, inputs->layer); depth_stride = scene->zsbuf.stride; }