OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lima: don't look at dirty bits for setup of FS key

Browse Source 
You always have to populate the key with the right texture swizzles, even
if textures haven't changed since binding a new shader.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9089>
This commit is contained in:
Eric Anholt
2021-02-16 12:45:08 -08:00
committed by Marge Bot
parent d4f706389c
commit 5a550c8dc7
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/lima/lima_program.c
View File

@@ -503,20 +503,16 @@ lima_update_fs_state(struct lima_context *ctx)
memset(key, 0, sizeof(*key)); memset(key, 0, sizeof(*key));
key->shader_state = ctx->bind_fs; key->shader_state = ctx->bind_fs;
if (((ctx->dirty & LIMA_CONTEXT_DIRTY_TEXTURES) && for (int i = 0; i < lima_tex->num_textures; i++) {
lima_tex->num_samplers &&
lima_tex->num_textures)) {
for (int i = 0; i < lima_tex->num_samplers; i++) {
struct lima_sampler_view *sampler = lima_sampler_view(lima_tex->textures[i]); struct lima_sampler_view *sampler = lima_sampler_view(lima_tex->textures[i]);
for (int j = 0; j < 4; j++) for (int j = 0; j < 4; j++)
key->tex[i].swizzle[j] = sampler->swizzle[j]; key->tex[i].swizzle[j] = sampler->swizzle[j];
} }
}
/* Fill rest with identity swizzle */ /* Fill rest with identity swizzle */
uint8_t identity[4] = { PIPE_SWIZZLE_X, PIPE_SWIZZLE_Y, uint8_t identity[4] = { PIPE_SWIZZLE_X, PIPE_SWIZZLE_Y,
PIPE_SWIZZLE_Z, PIPE_SWIZZLE_W }; PIPE_SWIZZLE_Z, PIPE_SWIZZLE_W };
for (int i = lima_tex->num_samplers; i < PIPE_MAX_SAMPLERS; i++) for (int i = lima_tex->num_textures; i < ARRAY_SIZE(key->tex); i++)
memcpy(key->tex[i].swizzle, identity, 4); memcpy(key->tex[i].swizzle, identity, 4);
struct lima_fs_shader_state *old_fs = ctx->fs; struct lima_fs_shader_state *old_fs = ctx->fs;