Henri Verbeet : wined3d: Add missing GL locking to delete_glsl_program_entry() calls.

Alexandre Julliard julliard at winehq.org
Thu May 14 11:07:41 CDT 2009


Module: wine
Branch: master
Commit: 12c4af8dd8de539c346c7af77c370b30a9478ece
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=12c4af8dd8de539c346c7af77c370b30a9478ece

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed May 13 18:22:53 2009 +0200

wined3d: Add missing GL locking to delete_glsl_program_entry() calls.

---

 dlls/wined3d/glsl_shader.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 44e0eea..7905492 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -3911,6 +3911,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) {
     if (linked_programs->next) {
         struct glsl_shader_prog_link *entry, *entry2;
 
+        ENTER_GL();
         if(pshader) {
             LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) {
                 delete_glsl_program_entry(priv, gl_info, entry);
@@ -3920,6 +3921,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) {
                 delete_glsl_program_entry(priv, gl_info, entry);
             }
         }
+        LEAVE_GL();
     }
 
     if(pshader) {




More information about the wine-cvs mailing list