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

Revert "iris: Use the data cache for indirect UBO pulls" 

This reverts commit 3b784370c3.

This fixes a 30% performance regression in Manhattan 3.1 on Icelake.

Fixes: 3b784370c3 "iris: Use the data cache for indirect UBO pulls"
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7173>
This commit is contained in:
Jason Ekstrand 2020-10-15 15:06:33 -05:00 committed by Marge Bot
parent a5529eb235
commit 6be2bbec6d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/iris/iris_program.c
View File

@ -174,7 +174,8 @@ iris_upload_ubo_ssbo_surf_state(struct iris_context *ice,
.address = res->bo->gtt_offset + res->offset +
buf->buffer_offset,
.size_B = buf->buffer_size - res->offset,
.format = ISL_FORMAT_RAW,
.format = ssbo ? ISL_FORMAT_RAW
: ISL_FORMAT_R32G32B32A32_FLOAT,
.swizzle = ISL_SWIZZLE_IDENTITY,
.stride_B = 1,
.mocs = iris_mocs(res->bo, &screen->isl_dev));

2
src/gallium/drivers/iris/iris_resource.c
View File

@ -2135,7 +2135,7 @@ iris_flush_bits_for_history(struct iris_resource *res)
if (res->bind_history & PIPE_BIND_CONSTANT_BUFFER) {
flush |= PIPE_CONTROL_CONST_CACHE_INVALIDATE |
PIPE_CONTROL_DATA_CACHE_FLUSH;
PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE;
}
if (res->bind_history & PIPE_BIND_SAMPLER_VIEW)

1
src/gallium/drivers/iris/iris_screen.c
View File

@ -805,7 +805,6 @@ iris_screen_create(int fd, const struct pipe_screen_config *config)
screen->compiler->supports_pull_constants = false;
screen->compiler->supports_shader_constants = true;
screen->compiler->compact_params = false;
screen->compiler->indirect_ubos_use_sampler = false;
screen->l3_config_3d = iris_get_default_l3_config(&screen->devinfo, false);
screen->l3_config_cs = iris_get_default_l3_config(&screen->devinfo, true);