Changeset 22319 in vbox

Timestamp:

Aug 18, 2009 11:12:15 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51204

Message:

crOpenGL: partial fix for crashing java apps with d3d support in guest

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Wine/wined3d/context.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_gentextures.c (modified) (1 diff)

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

@@ -305 +305 @@
         FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status);
 
-        /* Dump the FBO attachments */
-        for (i = 0; i < GL_LIMITS(buffers); ++i)
-        {
-            attachment = (IWineD3DSurfaceImpl *)context->current_fbo->render_targets[i];
+        if (context->current_fbo)
+        {
+            /* Dump the FBO attachments */
+            for (i = 0; i < GL_LIMITS(buffers); ++i)
+            {
+                attachment = (IWineD3DSurfaceImpl *)context->current_fbo->render_targets[i];
+                if (attachment)
+                {
+                    FIXME("\tColor attachment %d: (%p) %s %ux%u\n",
+                            i, attachment, debug_d3dformat(attachment->resource.format_desc->format),
+                            attachment->pow2Width, attachment->pow2Height);
+                }
+            }
+            attachment = (IWineD3DSurfaceImpl *)context->current_fbo->depth_stencil;
             if (attachment)
             {
-                FIXME("\tColor attachment %d: (%p) %s %ux%u\n",
-                        i, attachment, debug_d3dformat(attachment->resource.format_desc->format),
+                FIXME("\tDepth attachment: (%p) %s %ux%u\n",
+                        attachment, debug_d3dformat(attachment->resource.format_desc->format),
                         attachment->pow2Width, attachment->pow2Height);
             }
-        }
-        attachment = (IWineD3DSurfaceImpl *)context->current_fbo->depth_stencil;
-        if (attachment)
-        {
-            FIXME("\tDepth attachment: (%p) %s %ux%u\n",
-                    attachment, debug_d3dformat(attachment->resource.format_desc->format),
-                    attachment->pow2Width, attachment->pow2Height);
         }
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_gentextures.c

@@ -86 +86 @@
     crFree( local_progs );
 }
+
+void SERVER_DISPATCH_APIENTRY 
+crServerDispatchCopyTexImage2D(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
+{
+    GLsizei tw, th;
+
+    cr_server.head_spu->dispatch_table.GetTexLevelParameteriv(target, level, GL_TEXTURE_WIDTH, &width);
+    cr_server.head_spu->dispatch_table.GetTexLevelParameteriv(target, level, GL_TEXTURE_HEIGHT, &height);
+
+    /* Workaround for a wine or ati bug. Host drivers crash unless we first provide texture bounds. */
+    if (((tw!=width) || (th!=height)) && (internalFormat==GL_DEPTH_COMPONENT24))
+    {
+        crServerDispatchTexImage2D(target, level, internalFormat, width, height, border, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
+    }
+
+    cr_server.head_spu->dispatch_table.CopyTexImage2D(target, level, internalFormat, x, y, width, height, border);
+}