Changeset 33280 in vbox

Timestamp:

Oct 21, 2010 3:48:26 AM (14 years ago)

Author:

vboxsync

Message:

crOpenGL/wddm: disable partial blits for hd4800 only

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Wine/wined3d/directx.c (modified) (4 diffs)
• Additions/WINNT/Graphics/Wine/wined3d/surface.c (modified) (1 diff)
• Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h (modified) (1 diff)
• GuestHost/OpenGL/include/cr_pixeldata.h (modified) (1 diff)
• GuestHost/OpenGL/util/pixel.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_misc.c (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_special (modified) (1 diff)

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

@@ -868 +868 @@
 }
 
+static BOOL match_ati_hd4800(const struct wined3d_gl_info *gl_info, const char *gl_renderer,
+        enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device)
+{
+    if (card_vendor != HW_VENDOR_ATI) return FALSE;
+    if (device == CARD_ATI_RADEON_HD4800) return TRUE;
+    return FALSE;
+}
+
+static void quirk_fullsize_blit(struct wined3d_gl_info *gl_info)
+{
+    gl_info->quirks |= WINED3D_QUIRK_FULLSIZE_BLIT;
+}
+
 struct driver_quirk
 {
@@ -951 +964 @@
         quirk_fbo_tex_update,
         "FBO rebind for attachment updates"
+    },
+    {
+        match_ati_hd4800,
+        quirk_fullsize_blit,
+        "Fullsize blit"
     },
 };
@@ -1261 +1279 @@
         const char *gl_renderer, unsigned int *vidmem)
 {
+#ifndef VBOX_WITH_WDDM
     if (WINE_D3D10_CAPABLE(gl_info))
+#endif
     {
         /* Geforce 200 - highend */
@@ -1516 +1536 @@
      * Beware: renderer string do not match exact card model,
      * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */
+#ifndef VBOX_WITH_WDDM
     if (WINE_D3D10_CAPABLE(gl_info))
+#endif
     {
         /* Radeon EG CYPRESS XT / PRO HD5800 - highend */

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

@@ -3652 +3652 @@
                                &src_rect, Src->resource.usage, Src->resource.pool, Src->resource.format_desc,
                                &dst_rect, This->resource.usage, This->resource.pool, This->resource.format_desc)
-            && (myDevice->adapter->driver_info.vendor==HW_VENDOR_NVIDIA
+            && (!(myDevice->adapter->gl_info.quirks & WINED3D_QUIRK_FULLSIZE_BLIT)
                 || (dst_rect.right==This->currentDesc.Width && dst_rect.bottom==This->currentDesc.Height
                     && dst_rect.left==0 && dst_rect.top==0)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h

@@ -65 +65 @@
 #define WINED3D_QUIRK_NV_CLIP_BROKEN            0x00000010
 #define WINED3D_QUIRK_FBO_TEX_UPDATE            0x00000020
+#define WINED3D_QUIRK_FULLSIZE_BLIT             0x00000040
 
 /* Texture format fixups */

trunk/src/VBox/GuestHost/OpenGL/include/cr_pixeldata.h

@@ -43 +43 @@
                                                                          const GLubyte *srcPtr, const CRPixelPackState *srcPacking );
 
+DECLEXPORT(void) crDumpNamedTGA(const char *fname, GLint w, GLint h, GLvoid *data);
 DECLEXPORT(void) crDumpTGA(GLint w, GLint h, GLvoid *data);
 #ifdef __cplusplus

trunk/src/VBox/GuestHost/OpenGL/util/pixel.c

@@ -1802 +1802 @@
 {
     char fname[200];
+
+    if (!w || !h) return;
+
+    sprintf(fname, "tex%i.tga", _tnum++);
+    crDumpNamedTGA(fname, w, h, data);
+}
+
+void crDumpNamedTGA(const char* fname, GLint w, GLint h, GLvoid *data)
+{
     tgaheader_t header;
     FILE *out;
 
-    if (!w || !h) return;
-
-    sprintf(fname, "tex%i.tga", _tnum++);
     out = fopen(fname, "w");
     if (!out) crError("can't create %s!", fname);

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

@@ -270 +270 @@
 }
 
+/*#define CR_DUMP_BLITS*/
+
+#ifdef CR_DUMP_BLITS
+static int blitnum=0;
+static int copynum=0;
+#endif
+
 void SERVER_DISPATCH_APIENTRY 
 crServerDispatchCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
@@ -280 +287 @@
     {
         cr_server.head_spu->dispatch_table.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+
+#ifdef CR_DUMP_BLITS
+        {
+            SPUDispatchTable *gl = &cr_server.head_spu->dispatch_table;
+            void *img;
+            GLint w, h;
+            char fname[200];
+
+            copynum++;
+
+            gl->GetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w);
+            gl->GetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h);
+
+            img = crAlloc(w*h*4);
+            CRASSERT(img);
+
+            gl->GetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_BYTE, img);
+            sprintf(fname, "copy_blit%i_copy_%i.tga", blitnum, copynum);
+            crDumpNamedTGA(fname, w, h, img);
+            crFree(img);
+        }
+#endif
     }
     else /* negative height, means we have to Yinvert the source pixels while copying */
@@ -471 +500 @@
     }
 }
+
+void SERVER_DISPATCH_APIENTRY 
+crServerDispatchBlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+                                   GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, 
+                                   GLbitfield mask, GLenum filter)
+{
+#ifdef CR_DUMP_BLITS
+    SPUDispatchTable *gl = &cr_server.head_spu->dispatch_table;
+    GLint rfb=0, dfb=0, dtex=0, dlev=-1, rb=0, db=0, ppb=0, pub=0, vp[4], otex, dstw, dsth;
+    GLenum status;
+    char fname[200];
+    void *img;
+
+    blitnum++;
+
+    crDebug("[%i]BlitFramebufferEXT(%i, %i, %i, %i, %i, %i, %i, %i, %x, %x)", blitnum, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    crDebug("%i, %i <-> %i, %i", srcX1-srcX0, srcY1-srcY0, dstX1-dstX0, dstY1-dstY0);
+
+    gl->GetIntegerv(GL_READ_FRAMEBUFFER_BINDING_EXT, &rfb);
+    gl->GetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING_EXT, &dfb);
+    gl->GetIntegerv(GL_READ_BUFFER, &rb);
+    gl->GetIntegerv(GL_DRAW_BUFFER, &db);
+
+    gl->GetIntegerv(GL_PIXEL_PACK_BUFFER_BINDING, &ppb);
+    gl->GetIntegerv(GL_PIXEL_UNPACK_BUFFER_BINDING, &pub);
+
+    gl->GetIntegerv(GL_VIEWPORT, &vp[0]);
+
+    gl->GetIntegerv(GL_TEXTURE_BINDING_2D, &otex);
+
+    CRASSERT(!rfb && dfb);
+    gl->GetFramebufferAttachmentParameterivEXT(GL_DRAW_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT, &dtex);
+    gl->GetFramebufferAttachmentParameterivEXT(GL_DRAW_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT, &dlev);
+    status = gl->CheckFramebufferStatusEXT(GL_DRAW_FRAMEBUFFER_EXT);
+
+    CRASSERT(status==GL_FRAMEBUFFER_COMPLETE_EXT
+             && db==GL_COLOR_ATTACHMENT0_EXT
+             && (rb==GL_FRONT || rb==GL_BACK)
+             && !rfb && dfb && dtex && !dlev
+             && !ppb && !pub);
+
+    crDebug("Src[rb 0x%x, fbo %i] Dst[db 0x%x, fbo %i(0x%x), tex %i.%i]", rb, rfb, db, dfb, status, dtex, dlev);
+    crDebug("Viewport [%i, %i, %i, %i]", vp[0], vp[1], vp[2], vp[3]);
+
+    gl->PixelStorei(GL_PACK_ROW_LENGTH, 0);
+    gl->PixelStorei(GL_PACK_ALIGNMENT, 1);
+    gl->PixelStorei(GL_PACK_SKIP_PIXELS, 0);
+    gl->PixelStorei(GL_PACK_SKIP_ROWS, 0);
+
+    gl->PixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+    gl->PixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    gl->PixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+    gl->PixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+
+    gl->BindTexture(GL_TEXTURE_2D, dtex);
+    gl->GetTexLevelParameteriv(GL_TEXTURE_2D, dlev, GL_TEXTURE_WIDTH, &dstw);
+    gl->GetTexLevelParameteriv(GL_TEXTURE_2D, dlev, GL_TEXTURE_HEIGHT, &dsth);
+    gl->BindTexture(GL_TEXTURE_2D, otex);
+    crDebug("Dst is %i, %i", dstw, dsth);
+
+    CRASSERT(vp[2]>=dstw && vp[3]>=dsth);
+    img = crAlloc(vp[2]*vp[3]*4);
+    CRASSERT(img);
+
+    gl->ReadPixels(0, 0, vp[2], vp[3], GL_BGRA, GL_UNSIGNED_BYTE, img);
+    sprintf(fname, "blit%iA_src.tga", blitnum);
+    crDumpNamedTGA(fname, vp[2], vp[3], img);
+
+    gl->BindTexture(GL_TEXTURE_2D, dtex);
+    gl->GetTexImage(GL_TEXTURE_2D, dlev, GL_BGRA, GL_UNSIGNED_BYTE, img);
+    sprintf(fname, "blit%iB_dst.tga", blitnum);
+    crDumpNamedTGA(fname, dstw, dsth, img);
+    gl->BindTexture(GL_TEXTURE_2D, otex);
+#endif
+
+    cr_server.head_spu->dispatch_table.BlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1,
+                                                          dstX0, dstY0, dstX1, dstY1,
+                                                          mask, filter);
+
+#ifdef CR_DUMP_BLITS
+    gl->BindTexture(GL_TEXTURE_2D, dtex);
+    gl->GetTexImage(GL_TEXTURE_2D, dlev, GL_BGRA, GL_UNSIGNED_BYTE, img);
+    sprintf(fname, "blit%iC_res.tga", blitnum);
+    crDumpNamedTGA(fname, dstw, dsth, img);
+    gl->BindTexture(GL_TEXTURE_2D, otex);
+    crFree(img);
+#endif
+}

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_special

@@ -245 +245 @@
 GetObjectParameterivARB
 GetObjectParameterfvARB
+BlitFramebufferEXT