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

zink: delete faked_e5sparse

Browse source 
this never actually worked, and I'm not sure why I added it from testing

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28115>
This commit is contained in:
Mike Blumenkrantz 2024-03-11 15:15:09 -04:00 • committed by Marge Bot
parent 8fa413fef0
commit c85768e380
4 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/zink/zink_bo.c
View file

@ -970,9 +970,6 @@ zink_bo_commit(struct zink_context *ctx, struct zink_resource *res, unsigned lev
struct zink_bo *bo = res->obj->bo; struct zink_bo *bo = res->obj->bo;
VkSemaphore cur_sem = VK_NULL_HANDLE; VkSemaphore cur_sem = VK_NULL_HANDLE;
if (screen->faked_e5sparse && res->base.b.format == PIPE_FORMAT_R9G9B9E5_FLOAT)
return true;
simple_mtx_lock(&screen->queue_lock); simple_mtx_lock(&screen->queue_lock);
simple_mtx_lock(&bo->lock); simple_mtx_lock(&bo->lock);
if (res->base.b.target == PIPE_BUFFER) { if (res->base.b.target == PIPE_BUFFER) {

4
src/gallium/drivers/zink/zink_resource.c
View file

@ -1590,10 +1590,6 @@ resource_create(struct pipe_screen *pscreen,
if (templ2.flags & PIPE_RESOURCE_FLAG_SPARSE && if (templ2.flags & PIPE_RESOURCE_FLAG_SPARSE &&
(util_res_sample_count(templ) == 1 || screen->info.feats.features.shaderStorageImageMultisample)) (util_res_sample_count(templ) == 1 || screen->info.feats.features.shaderStorageImageMultisample))
templ2.bind |= PIPE_BIND_SHADER_IMAGE; templ2.bind |= PIPE_BIND_SHADER_IMAGE;
if (screen->faked_e5sparse && templ->format == PIPE_FORMAT_R9G9B9E5_FLOAT) {
templ2.flags &= ~PIPE_RESOURCE_FLAG_SPARSE;
res->base.b.flags &= ~PIPE_RESOURCE_FLAG_SPARSE;
}
res->obj = resource_object_create(screen, &templ2, whandle, &linear, res->modifiers, res->modifiers_count, loader_private, user_mem); res->obj = resource_object_create(screen, &templ2, whandle, &linear, res->modifiers, res->modifiers_count, loader_private, user_mem);
if (!res->obj) { if (!res->obj) {
free(res->modifiers); free(res->modifiers);

7
src/gallium/drivers/zink/zink_screen.c
View file

@ -2663,14 +2663,9 @@ zink_get_sparse_texture_virtual_page_size(struct pipe_screen *pscreen,
flags, flags,
VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_TILING_OPTIMAL,
&prop_count, props); &prop_count, props);
if (!prop_count) { if (!prop_count)
if (pformat == PIPE_FORMAT_R9G9B9E5_FLOAT) {
screen->faked_e5sparse = true;
goto hack_it_up;
}
return 0; return 0;
} }
}
if (size) { if (size) {
if (x) if (x)

1
src/gallium/drivers/zink/zink_types.h
View file

@ -1499,7 +1499,6 @@ struct zink_screen {
bool need_decompose_attrs; bool need_decompose_attrs;
bool need_2D_zs; bool need_2D_zs;
bool need_2D_sparse; bool need_2D_sparse;
bool faked_e5sparse; //drivers may not expose R9G9B9E5 but cts requires it
bool can_hic_shader_read; bool can_hic_shader_read;
uint32_t gfx_queue; uint32_t gfx_queue;