fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-30 09:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

tgsi: fix tgsi_exec_machine_bind_shader() to handle NULL tokens, samplers

Browse source 
This lets us unbind a shader from the tgsi_exec_machine.  Since
shaders aren't ref counted we need this to properly clean up when
deleting shaders elsewhere.
This commit is contained in:
Brian Paul 2010-05-06 14:38:55 -06:00
parent fbb1ad33a4
commit c8f0e805a9
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gallium/auxiliary/tgsi/tgsi_exec.c
View file

@ -635,6 +635,23 @@ tgsi_exec_machine_bind_shader(
mach->Tokens = tokens;
mach->Samplers = samplers;
if (!tokens) {
/* unbind and free all */
if (mach->Declarations) {
FREE( mach->Declarations );
}
mach->Declarations = NULL;
mach->NumDeclarations = 0;
if (mach->Instructions) {
FREE( mach->Instructions );
}
mach->Instructions = NULL;
mach->NumInstructions = 0;
return;
}
k = tgsi_parse_init (&parse, mach->Tokens);
if (k != TGSI_PARSE_OK) {
debug_printf( "Problem parsing!\n" );
@ -792,7 +809,9 @@ void
tgsi_exec_machine_destroy(struct tgsi_exec_machine *mach)
{
if (mach) {
FREE(mach->Instructions);
if (mach->Instructions)
FREE(mach->Instructions);
if (mach->Declarations)
FREE(mach->Declarations);
}