Changeset 35822 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c

Timestamp:

Feb 2, 2011 1:23:37 PM (14 years ago)

Author:

vboxsync

Message:

wined3d: properly recreate shaders if multiply swapchains are used

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c (modified) (17 diffs)

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

@@ -126 +126 @@
     struct ps_compile_args      ps_args;
     UINT                        constant_version;
+    const struct wined3d_context *context;
 #ifdef VBOX_WITH_WDDM
     UINT                        inp2Fixup_info;
@@ -145 +146 @@
 
 typedef struct {
-    IWineD3DVertexShader        *vshader;
-    IWineD3DPixelShader         *pshader;
-    struct ps_compile_args      ps_args;
-    struct vs_compile_args      vs_args;
+    IWineD3DVertexShader         *vshader;
+    IWineD3DPixelShader          *pshader;
+    struct ps_compile_args       ps_args;
+    struct vs_compile_args       vs_args;
+    const struct wined3d_context *context;
 } glsl_program_key_t;
 
@@ -162 +164 @@
     struct ps_np2fixup_info         np2fixup;
     GLhandleARB                     prgId;
+    const struct wined3d_context    *context;
 };
 
@@ -174 +177 @@
     struct vs_compile_args          args;
     GLhandleARB                     prgId;
+    const struct wined3d_context    *context;
 };
 
@@ -3667 +3671 @@
     key.vs_args = entry->vs_args;
     key.ps_args = entry->ps_args;
+    key.context = entry->context;
 
     if (wine_rb_put(&priv->program_lookup, &key, &entry->program_lookup_entry) == -1)
@@ -3676 +3681 @@
 static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv,
         IWineD3DVertexShader *vshader, IWineD3DPixelShader *pshader, struct vs_compile_args *vs_args,
-        struct ps_compile_args *ps_args) {
+        struct ps_compile_args *ps_args, const struct wined3d_context *context) {
     struct wine_rb_entry *entry;
     glsl_program_key_t key;
@@ -3684 +3689 @@
     key.vs_args = *vs_args;
     key.ps_args = *ps_args;
+    key.context = context;
 
     entry = wine_rb_get(&priv->program_lookup, &key);
@@ -3699 +3705 @@
     key.vs_args = entry->vs_args;
     key.ps_args = entry->ps_args;
+    key.context = entry->context;
     wine_rb_remove(&priv->program_lookup, &key);
 
-    TRACE("deleting program %u\n", entry->programId);
-    GL_EXTCALL(glDeleteObjectARB(entry->programId));
-    checkGLcall("glDeleteObjectARB");
+    if (context_get_current() == entry->context)
+    {
+        TRACE("deleting program %u\n", entry->programId);
+        GL_EXTCALL(glDeleteObjectARB(entry->programId));
+        checkGLcall("glDeleteObjectARB");
+    }
+    else
+    {
+        WARN("Attempting to delete program %u created in ctx %p from ctx %p\n", entry->programId, entry->context, context_get_current());
+    }
+    
     if (entry->vshader) list_remove(&entry->vshader_entry);
     if (entry->pshader) list_remove(&entry->pshader_entry);
@@ -4252 +4267 @@
      */
     for(i = 0; i < shader_data->num_gl_shaders; i++) {
-        if(memcmp(&shader_data->gl_shaders[i].args, args, sizeof(*args)) == 0) {
+        if(shader_data->gl_shaders[i].context==context
+           && memcmp(&shader_data->gl_shaders[i].args, args, sizeof(*args)) == 0) {
             if(args->np2_fixup) {
 #ifdef VBOX_WITH_WDDM
@@ -4284 +4300 @@
     }
 
+    shader_data->gl_shaders[shader_data->num_gl_shaders].context = context;
     shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args;
 
@@ -4338 +4355 @@
      */
     for(i = 0; i < shader_data->num_gl_shaders; i++) {
-        if(vs_args_equal(&shader_data->gl_shaders[i].args, args, use_map)) {
+        if(shader_data->gl_shaders[i].context==context
+           && vs_args_equal(&shader_data->gl_shaders[i].args, args, use_map)) {
             return shader_data->gl_shaders[i].prgId;
         }
@@ -4364 +4382 @@
     }
 
+    shader_data->gl_shaders[shader_data->num_gl_shaders].context = context;
     shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args;
 
@@ -4401 +4420 @@
     if (pshader) find_ps_compile_args((IWineD3DPixelShaderImpl *)pshader, device->stateBlock, &ps_compile_args);
 
-    entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args);
+    entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args, context);
     if (entry) {
         priv->glsl_program = entry;
@@ -4413 +4432 @@
     /* Create the entry */
     entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link));
+    entry->context = context;
     entry->programId = programId;
     entry->vshader = vshader;
@@ -4812 +4832 @@
         ENTER_GL();
         for(i = 0; i < shader_data->num_gl_shaders; i++) {
-            TRACE("deleting pshader %u\n", shader_data->gl_shaders[i].prgId);
-            GL_EXTCALL(glDeleteObjectARB(shader_data->gl_shaders[i].prgId));
-            checkGLcall("glDeleteObjectARB");
+            if (shader_data->gl_shaders[i].context==context_get_current())
+            {
+                TRACE("deleting pshader %u\n", shader_data->gl_shaders[i].prgId);
+                GL_EXTCALL(glDeleteObjectARB(shader_data->gl_shaders[i].prgId));
+                checkGLcall("glDeleteObjectARB");
+            }
+            else
+            {
+                WARN("Attempting to delete pshader %u created in ctx %p from ctx %p\n", 
+                     shader_data->gl_shaders[i].prgId, shader_data->gl_shaders[i].context, context_get_current());
+            }
         }
         LEAVE_GL();
@@ -4826 +4854 @@
         ENTER_GL();
         for(i = 0; i < shader_data->num_gl_shaders; i++) {
-            TRACE("deleting vshader %u\n", shader_data->gl_shaders[i].prgId);
-            GL_EXTCALL(glDeleteObjectARB(shader_data->gl_shaders[i].prgId));
-            checkGLcall("glDeleteObjectARB");
+            if (shader_data->gl_shaders[i].context==context_get_current())
+            {
+                TRACE("deleting vshader %u\n", shader_data->gl_shaders[i].prgId);
+                GL_EXTCALL(glDeleteObjectARB(shader_data->gl_shaders[i].prgId));
+                checkGLcall("glDeleteObjectARB");
+            }
+            else
+            {
+                WARN("Attempting to delete vshader %u created in ctx %p from ctx %p\n", 
+                     shader_data->gl_shaders[i].prgId, shader_data->gl_shaders[i].context, context_get_current());
+            }
         }
         LEAVE_GL();
@@ -4846 +4882 @@
             const struct glsl_shader_prog_link, program_lookup_entry);
     int cmp;
+
+    if (k->context > prog->context) return 1;
+    else if (k->context < prog->context) return -1;
 
     if (k->vshader > prog->vshader) return 1;