fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-15 08:50:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

svga: Ensure SWTNL is created after HWTNL.

Browse source 
Matches the internal driver layering, and prevents null svga->hwtnl
dereferencing from inside the swtnl.
This commit is contained in:
José Fonseca 2011-02-18 14:29:48 +00:00
parent 15c3e21097
commit 0cb6329e89
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/svga/svga_context.c
View file

@ -126,9 +126,6 @@ struct pipe_context *svga_context_create( struct pipe_screen *screen,
svga->debug.no_line_width = debug_get_option_no_line_width();
svga->debug.force_hw_line_stipple = debug_get_option_force_hw_line_stipple();
if (!svga_init_swtnl(svga))
goto no_swtnl;
svga->fs_bm = util_bitmask_create();
if (svga->fs_bm == NULL)
goto no_fs_bm;
@ -157,6 +154,8 @@ struct pipe_context *svga_context_create( struct pipe_screen *screen,
if (svga->hwtnl == NULL)
goto no_hwtnl;
if (!svga_init_swtnl(svga))
goto no_swtnl;
ret = svga_emit_initial_state( svga );
if (ret)
@ -179,6 +178,8 @@ struct pipe_context *svga_context_create( struct pipe_screen *screen,
return &svga->pipe;
no_state:
svga_destroy_swtnl(svga);
no_swtnl:
svga_hwtnl_destroy( svga->hwtnl );
no_hwtnl:
u_upload_destroy( svga->upload_vb );
@ -189,8 +190,6 @@ no_upload_ib:
no_vs_bm:
util_bitmask_destroy( svga->fs_bm );
no_fs_bm:
svga_destroy_swtnl(svga);
no_swtnl:
svga->swc->destroy(svga->swc);
no_swc:
FREE(svga);