Changeset 47061 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jul 9, 2013 5:26:01 PM (12 years ago)

Author:

vboxsync

Message:

wined3d: fix shader cleanup

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• Makefile.kmk (modified) (1 diff)
• wined3d/glsl_shader.c (modified) (7 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

@@ -173 +173 @@
         VBOX_WITH_WINE_FIX_TEXCLEAR \
         VBOX_WITH_WINE_FIX_STRINFOBUF \
+        VBOX_WITH_WINE_FIX_SHADERCLEANUP \
         VBOX_WITH_WINE_DBG
 #wined3d_DEFS        += VBOX_WITH_WINE_FIXES

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/glsl_shader.c

@@ -4187 +4187 @@
 }
 
+#ifdef VBOX_WITH_WINE_FIX_SHADERCLEANUP
+static void shader_glsl_disable(void *shader_priv, const struct wined3d_context *context);
+#endif
+
 /* Context activation is done by the caller. */
 static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info,
-        struct glsl_shader_prog_link *entry)
+        struct glsl_shader_prog_link *entry
+#ifdef VBOX_WITH_WINE_FIX_SHADERCLEANUP
+        , struct wined3d_context *context
+#endif
+        )
 {
     struct glsl_program_key key;
@@ -4197 +4205 @@
     key.ps_id = entry->ps.id;
     wine_rb_remove(&priv->program_lookup, &key);
+#ifdef VBOX_WITH_WINE_FIX_SHADERCLEANUP
+    if (priv->glsl_program == entry)
+    {
+        shader_glsl_disable(priv, context);
+        Assert(!priv->glsl_program);
+    }
+#endif
 
     GL_EXTCALL(glDeleteObjectARB(entry->programId));
@@ -6193 +6208 @@
                         struct glsl_shader_prog_link, ps.shader_entry)
                 {
-                    delete_glsl_program_entry(priv, gl_info, entry);
+                    delete_glsl_program_entry(priv, gl_info, entry
+#ifdef VBOX_WITH_WINE_FIX_SHADERCLEANUP
+                            , context
+#endif
+                            );
                 }
 
@@ -6216 +6235 @@
                         struct glsl_shader_prog_link, vs.shader_entry)
                 {
-                    delete_glsl_program_entry(priv, gl_info, entry);
+                    delete_glsl_program_entry(priv, gl_info, entry
+#ifdef VBOX_WITH_WINE_FIX_SHADERCLEANUP
+                            , context
+#endif
+                    );
                 }
 
@@ -6239 +6262 @@
                         struct glsl_shader_prog_link, gs.shader_entry)
                 {
-                    delete_glsl_program_entry(priv, gl_info, entry);
+                    delete_glsl_program_entry(priv, gl_info, entry
+#ifdef VBOX_WITH_WINE_FIX_SHADERCLEANUP
+                            , context
+#endif
+                            );
                 }
 
@@ -6709 +6736 @@
             struct glsl_shader_prog_link, vs.shader_entry)
     {
-        delete_glsl_program_entry(ctx->priv, ctx->gl_info, program);
+        delete_glsl_program_entry(ctx->priv, ctx->gl_info, program
+#ifdef VBOX_WITH_WINE_FIX_SHADERCLEANUP
+                            , NULL
+#endif
+                            );
     }
     ctx->gl_info->gl_ops.ext.p_glDeleteObjectARB(shader->id);
@@ -6970 +7001 @@
             struct glsl_shader_prog_link, ps.shader_entry)
     {
-        delete_glsl_program_entry(ctx->priv, ctx->gl_info, program);
+        delete_glsl_program_entry(ctx->priv, ctx->gl_info, program
+#ifdef VBOX_WITH_WINE_FIX_SHADERCLEANUP
+                            , context
+#endif
+                            );
     }
     ctx->gl_info->gl_ops.ext.p_glDeleteObjectARB(shader->id);