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

glsl: don't reference shader prog data during cache fallback

Browse Source 
We already have a reference.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri
2016-11-20 17:48:27 +11:00
committed by Timothy Arceri
parent 2f19accc5e
commit 0e9991f957
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/glsl/linker.cpp
View File

@@ -2197,7 +2197,8 @@ link_intrastage_shaders(void *mem_ctx,
return NULL; return NULL;
} }
_mesa_reference_shader_program_data(ctx, &gl_prog->sh.data, prog->data); if (!prog->data->cache_fallback)
_mesa_reference_shader_program_data(ctx, &gl_prog->sh.data, prog->data);
/* Don't use _mesa_reference_program() just take ownership */ /* Don't use _mesa_reference_program() just take ownership */
linked->Program = gl_prog; linked->Program = gl_prog;

3
src/mesa/main/shaderobj.c
View File

@@ -430,7 +430,8 @@ _mesa_delete_shader_program(struct gl_context *ctx,
struct gl_shader_program *shProg) struct gl_shader_program *shProg)
{ {
_mesa_free_shader_program_data(ctx, shProg); _mesa_free_shader_program_data(ctx, shProg);
_mesa_reference_shader_program_data(ctx, &shProg->data, NULL); if (!shProg->data->cache_fallback)
_mesa_reference_shader_program_data(ctx, &shProg->data, NULL);
ralloc_free(shProg); ralloc_free(shProg);
} }