fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swr: Rework scratch space allocation

Browse source 
Remove allocation of > 2kbyte buffers into context memory in
swr_copy_to_scatch_space() (which is used to copy small vertex/index buffers
and shader constants to a scratch space to be used by the upcoming draw.)

Large shader constant allocations need to be done in the circular scratch
buffer instead of context memory, because their values persist across
render calls.

Also lower SCRATCH_SINGLE_ALLOCATION_LIMIT to 8k, since allocations of larger
buffers will get too large for the circular scratch space.

Fixes render issues with CEI Ensight.

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
George Kyriazis 2017-10-18 14:10:26 -05:00
parent ffaf4d608a
commit f9d239e11f
2 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/gallium/drivers/swr/swr_scratch.cpp
View file

@ -28,8 +28,6 @@
#include "swr_fence_work.h" #include "swr_fence_work.h"
#include "api.h" #include "api.h"
#define SCRATCH_SINGLE_ALLOCATION_LIMIT 2048
void * void *
swr_copy_to_scratch_space(struct swr_context *ctx, swr_copy_to_scratch_space(struct swr_context *ctx,
struct swr_scratch_space *space, struct swr_scratch_space *space,
@ -40,41 +38,36 @@ swr_copy_to_scratch_space(struct swr_context *ctx,
assert(space); assert(space);
assert(size); assert(size);
if (size >= SCRATCH_SINGLE_ALLOCATION_LIMIT) { /* Allocate enough so that MAX_DRAWS_IN_FLIGHT sets fit. */
/* Use per draw SwrAllocDrawContextMemory for larger copies */ uint32_t max_size_in_flight = size * ctx->max_draws_in_flight;
ptr = ctx->api.pfnSwrAllocDrawContextMemory(ctx->swrContext, size, 4);
} else {
/* Allocate enough so that MAX_DRAWS_IN_FLIGHT sets fit. */
uint32_t max_size_in_flight = size * ctx->max_draws_in_flight;
/* Need to grow space */ /* Need to grow space */
if (max_size_in_flight > space->current_size) { if (max_size_in_flight > space->current_size) {
space->current_size = max_size_in_flight; space->current_size = max_size_in_flight;
if (space->base) { if (space->base) {
/* defer delete, use aligned-free */ /* defer delete, use aligned-free */
struct swr_screen *screen = swr_screen(ctx->pipe.screen); struct swr_screen *screen = swr_screen(ctx->pipe.screen);
swr_fence_work_free(screen->flush_fence, space->base, true); swr_fence_work_free(screen->flush_fence, space->base, true);
space->base = NULL; space->base = NULL;
}
if (!space->base) {
space->base = (uint8_t *)AlignedMalloc(space->current_size,
sizeof(void *));
space->head = (void *)space->base;
}
} }
/* Wrap */ if (!space->base) {
if (((uint8_t *)space->head + size) space->base = (uint8_t *)AlignedMalloc(space->current_size,
>= ((uint8_t *)space->base + space->current_size)) { sizeof(void *));
space->head = space->base; space->head = (void *)space->base;
} }
ptr = space->head;
space->head = (uint8_t *)space->head + size;
} }
/* Wrap */
if (((uint8_t *)space->head + size)
>= ((uint8_t *)space->base + space->current_size)) {
space->head = space->base;
}
ptr = space->head;
space->head = (uint8_t *)space->head + size;
/* Copy user_buffer to scratch */ /* Copy user_buffer to scratch */
if (user_buffer) if (user_buffer)
memcpy(ptr, user_buffer, size); memcpy(ptr, user_buffer, size);

2
src/gallium/drivers/swr/swr_screen.cpp
View file

@ -57,7 +57,7 @@
#define SWR_MAX_TEXTURE_ARRAY_LAYERS 512 /* 8K x 512 / 8K x 8K x 512 */ #define SWR_MAX_TEXTURE_ARRAY_LAYERS 512 /* 8K x 512 / 8K x 8K x 512 */
/* Default max client_copy_limit */ /* Default max client_copy_limit */
#define SWR_CLIENT_COPY_LIMIT 32768 #define SWR_CLIENT_COPY_LIMIT 8192
/* Flag indicates creation of alternate surface, to prevent recursive loop /* Flag indicates creation of alternate surface, to prevent recursive loop
* in resource creation when msaa_force_enable is set. */ * in resource creation when msaa_force_enable is set. */