KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmpipe: Allocate scene tiles dynamically 

If you allocate this statically it's 1.5MB because the framebuffer might
be 16k x 16k, that's excessive.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17746>
This commit is contained in:
Dave Airlie 2020-05-01 13:31:57 +10:00 committed by Marge Bot
parent b611195490
commit 7d8942846d
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gallium/drivers/llvmpipe/lp_scene.c
View File

@ -28,6 +28,7 @@
#include "util/u_framebuffer.h"
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/reallocarray.h"
#include "util/u_inlines.h"
#include "util/format/u_format.h"
#include "lp_scene.h"
@ -101,6 +102,7 @@ lp_scene_destroy(struct lp_scene *scene)
{
lp_scene_end_rasterization(scene);
mtx_destroy(&scene->mutex);
free(scene->tiles);
assert(scene->data.head == &scene->data.first);
slab_free_st(&scene->setup->scene_slab, scene);
}
@ -245,7 +247,7 @@ lp_scene_end_rasterization(struct lp_scene *scene )
/* Reset all command lists:
*/
memset(scene->tile, 0, sizeof scene->tile);
memset(scene->tiles, 0, sizeof(struct cmd_bin) * scene->num_alloced_tiles);
/* Decrement texture ref counts
*/
@ -612,6 +614,15 @@ void lp_scene_begin_binning(struct lp_scene *scene,
assert(scene->tiles_x <= TILES_X);
assert(scene->tiles_y <= TILES_Y);
unsigned num_required_tiles = scene->tiles_x * scene->tiles_y;
if (scene->num_alloced_tiles < num_required_tiles) {
scene->tiles = reallocarray(scene->tiles, num_required_tiles, sizeof(struct cmd_bin));
if (!scene->tiles)
return;
memset(scene->tiles, 0, sizeof(struct cmd_bin) * num_required_tiles);
scene->num_alloced_tiles = num_required_tiles;
}
/*
* Determine how many layers the fb has (used for clamping layer value).
* OpenGL (but not d3d10) permits different amount of layers per rt, however

6
src/gallium/drivers/llvmpipe/lp_scene.h
View File

@ -197,7 +197,8 @@ struct lp_scene {
int curr_x, curr_y; /**< for iterating over bins */
mtx_t mutex;
struct cmd_bin tile[TILES_X][TILES_Y];
unsigned num_alloced_tiles;
struct cmd_bin *tiles;
struct data_block_list data;
};
@ -300,7 +301,8 @@ lp_scene_alloc_aligned(struct lp_scene *scene, unsigned size,
static inline struct cmd_bin *
lp_scene_get_bin(struct lp_scene *scene, unsigned x, unsigned y)
{
return &scene->tile[x][y];
unsigned idx = scene->tiles_x * y + x;
return &scene->tiles[idx];
}