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

Timestamp:

May 2, 2012 8:37:46 AM (13 years ago)

Author:

vboxsync

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

77709

Message:

crOpenGL,wined3d,wddm: second part of fixing resource leakage, basics for cr commands submission from r0 miniport driver (for r0 visible region reporting, WPF 3D rendering fixes w/o Aero, etc.)

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Video/disp/wddm/VBoxDispD3D.cpp (modified) (5 diffs)
• Video/mp/Makefile.kmk (modified) (1 diff)
• Video/mp/wddm/VBoxMPCr.cpp (modified) (1 diff)
• Video/mp/wddm/VBoxMPShgsmi.cpp (modified) (1 diff)
• Video/mp/wddm/VBoxMPShgsmi.h (modified) (1 diff)
• Wine/wined3d/basetexture.c (modified) (5 diffs)
• Wine/wined3d/device.c (modified) (1 diff)
• Wine/wined3d/resource.c (modified) (1 diff)
• Wine/wined3d/surface.c (modified) (11 diffs)
• Wine/wined3d/texture.c (modified) (3 diffs)
• Wine/wined3d/vboxsharedrc.h (modified) (2 diffs)
• Wine/wined3d/wined3d_gl.h (modified) (1 diff)
• Wine/wined3d/wined3d_private.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -2469 +2469 @@
     return hr;
 }
-
-static HRESULT vboxWddmShRcRefAlloc(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_ALLOCATION pAlloc, BOOL fAddRef, DWORD *pcRefs)
-{
-    D3DDDICB_ESCAPE DdiEscape = {0};
-    VBOXDISPIFESCAPE_SHRC_REF Data = {0};
-    DdiEscape.hContext = pDevice->DefaultContext.ContextInfo.hContext;
-    DdiEscape.hDevice = pDevice->hDevice;
-    DdiEscape.Flags.HardwareAccess = 1;
-    DdiEscape.pPrivateDriverData = &Data;
-    DdiEscape.PrivateDriverDataSize = sizeof (Data);
-    Data.EscapeHdr.escapeCode = fAddRef ? VBOXESC_SHRC_ADDREF : VBOXESC_SHRC_RELEASE;
-    Data.hAlloc = (uint64_t)pAlloc->hAllocation;
-    HRESULT hr = pDevice->RtCallbacks.pfnEscapeCb(pDevice->pAdapter->hAdapter, &DdiEscape);
-    if (FAILED(hr))
-    {
-        WARN(("pfnEscapeCb, hr (0x%x)", hr));
-        return TRUE;
-    }
-
-    LOG(("shrc(0x%p) refs(%d)", (void*)pAlloc->hSharedHandle, Data.EscapeHdr.u32CmdSpecific));
-    if (pcRefs)
-        *pcRefs = Data.EscapeHdr.u32CmdSpecific;
-
-    return hr;
-}
-
-static HRESULT vboxWddmShRcRefRc(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_RESOURCE pRc, BOOL fAddRef, DWORD *pcRefs)
-{
-    Assert(pRc->RcDesc.fFlags.SharedResource);
-    DWORD cTotalRefs = 0;
-    HRESULT hr = S_OK;
-    for (DWORD i = 0; i < pRc->cAllocations; ++i)
-    {
-        DWORD cRefs = 0;
-        PVBOXWDDMDISP_ALLOCATION pAlloc = &pRc->aAllocations[i];
-        if(!pAlloc->hSharedHandle)
-            continue;
-
-        hr = vboxWddmShRcRefAlloc(pDevice, pAlloc, fAddRef, &cRefs);
-
-        if (FAILED(hr))
-        {
-            WARN(("vboxWddmShRcRefAlloc failed, hr()0x%x", hr));
-            for (DWORD j = 0; j < i; ++j)
-            {
-                PVBOXWDDMDISP_ALLOCATION pAlloc = &pRc->aAllocations[i];
-                if(!pAlloc->hSharedHandle)
-                    continue;
-                HRESULT tmpHr = vboxWddmShRcRefAlloc(pDevice, pAlloc, !fAddRef, NULL);
-                Assert(SUCCEEDED(tmpHr));
-            }
-            return hr;
-        }
-
-        /* success! */
-        cTotalRefs += cRefs;
-    }
-
-    Assert(cTotalRefs || !fAddRef);
-
-    /* success! */
-    if (pcRefs)
-        *pcRefs = cTotalRefs;
-
-    return S_OK;
-}
-
 
 static HRESULT vboxWddmSwapchainChkCreateIf(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_SWAPCHAIN pSwapchain)
@@ -5681 +5614 @@
                     if (pResource->Flags.SharedResource)
                     {
-                        if (pAllocation->hSharedHandle)
-                        {
-                            vboxWddmShRcRefAlloc(pDevice, pAllocation, TRUE, NULL);
-                        }
 #ifdef DEBUG_misha
                         Assert(VBOXWDDMDISP_IS_TEXTURE(pResource->Flags));
@@ -5747 +5676 @@
         for (UINT i = 0; i < pRc->cAllocations; ++i)
         {
-            BOOL fSetDelete = FALSE;
             PVBOXWDDMDISP_ALLOCATION pAlloc = &pRc->aAllocations[i];
             if (pAlloc->hSharedHandle)
             {
-                /* using one and the same shared resource by different clients could lead to the situation where one client can still refer to the resource
-                 * while another one has deleted it
-                 * this could lead to gl state corruption on both host and guest side.
-                 * This is why we take extra care to avoid it.
-                 * Until we do a vboxWddmShRcRefAlloc call below the resource is guarantied to be present, however it can be removed any time after the call
-                 * if cShRcRefs is non-zero, i.e. the current cliet is not the one deleting it.
-                 * We first explicitely say to wine that resource must NOT be accessed any more and that all references to it should be cleaned */
-                pAdapter->D3D.pfnVBoxWineExD3DRc9SetShRcState((IDirect3DResource9*)pAlloc->pD3DIf, VBOXWINEEX_SHRC_STATE_GL_DISABLE);
-
-                DWORD cShRcRefs;
-                HRESULT tmpHr = vboxWddmShRcRefAlloc(pDevice, pAlloc, FALSE, &cShRcRefs);
-                if (!cShRcRefs)
-                {
-                    /* the current client IS the one deleting this resource */
-                    fSetDelete = TRUE;
-                }
 #ifdef DEBUG_misha
                 vboxVDbgPrint(("\n\n********\n(0x%x:0n%d)Shared DESTROYED pAlloc(0x%p), hRc(0x%p), hAl(0x%p), "
@@ -5775 +5687 @@
                             ));
 #endif
-            }
-
-            if (fSetDelete)
-            {
-                Assert(pAlloc->pD3DIf);
-                pAdapter->D3D.pfnVBoxWineExD3DRc9SetShRcState((IDirect3DResource9*)pAlloc->pD3DIf, VBOXWINEEX_SHRC_STATE_GL_DELETE);
             }
 
@@ -7091 +6997 @@
                     Assert(pAllocation->hSharedHandle);
 #endif
-
-                    vboxWddmShRcRefAlloc(pDevice, pAllocation, TRUE, NULL);
-
                     vboxVDbgPrint(("\n\n********\n(0x%x:0n%d)Shared OPENNED pAlloc(0x%p), hRc(0x%p), hAl(0x%p), "
                                     "Handle(0x%x), (0n%d) \n***********\n\n",

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

@@ -87 +87 @@
  endif
  VBoxVideoWddm_DEFS       += LOG_TO_BACKDOOR
- VBoxVideoWddm_INCS       += ../../../include .. . ../../../../common/VBoxGuestLib $(VBOX_PATH_CROGL_INCLUDE)
+ VBoxVideoWddm_INCS       += ../../../include .. . ../../../../common/VBoxGuestLib $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
  VBoxVideoWddm_LDFLAGS.x86 += /Entry:DriverEntry@8
  VBoxVideoWddm_LDFLAGS.amd64 += /Entry:DriverEntry

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.cpp

@@ -20 +20 @@
 #include "VBoxMPCr.h"
 
+#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+
 #include <cr_protocol.h>
 
-#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+#if 0
+#include <cr_pack.h>
+
+typedef struct PVBOXMP_SHGSMIPACKER
+{
+    PVBOXMP_DEVEXT pDevExt;
+    CRPackContext CrPacker;
+    CRPackBuffer CrBuffer;
+} PVBOXMP_SHGSMIPACKER, *PPVBOXMP_SHGSMIPACKER;
+
+static void* vboxMpCrShgsmiBufferAlloc(PVBOXMP_DEVEXT pDevExt, HGSMISIZE cbData)
+{
+    return VBoxSHGSMIHeapBufferAlloc(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, cbData);
+}
+
+static void vboxMpCrShgsmiBufferFree(PVBOXMP_DEVEXT pDevExt, void *pvBuffer)
+{
+    VBoxSHGSMIHeapBufferFree(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pvBuffer);
+}
+
+static void vboxMpCrShgsmiPackerCbFlush(void *pvFlush)
+{
+    PPVBOXMP_SHGSMIPACKER pPacker = (PPVBOXMP_SHGSMIPACKER)pvFlush;
+
+    crPackReleaseBuffer(&pPacker->CrPacker);
+
+    if (pPacker->CrBuffer.opcode_current != pPacker->CrBuffer.opcode_start)
+    {
+        CRMessageOpcodes *pHdr;
+        unsigned int len;
+        pHdr = vboxMpCrPackerPrependHeader(&pPacker->CrBuffer, &len, 0);
+
+        /*Send*/
+    }
+
+
+    crPackSetBuffer(&pPacker->CrPacker, &pPacker->CrBuffer);
+    crPackResetPointers(&pPacker->CrPacker);
+}
+
+static int vboxMpCrShgsmiPackerInit(PPVBOXMP_SHGSMIPACKER pPacker, PVBOXMP_DEVEXT pDevExt)
+{
+    memset(pPacker, 0, sizeof (*pPacker));
+
+    static const cbBuffer = 1000;
+    void *pvBuffer = vboxMpCrShgsmiBufferAlloc(pDevExt, cbBuffer);
+    if (!pvBuffer)
+    {
+        WARN(("vboxMpCrShgsmiBufferAlloc failed"));
+        return VERR_NO_MEMORY;
+    }
+    crPackInitBuffer(&pPacker->CrBuffer, pvBuffer, cbBuffer, cbBuffer);
+    crPackSetBuffer(&pPacker->CrPacker, &pPacker->CrBuffer);
+    crPackFlushFunc(&pPacker->CrPacker, vboxMpCrShgsmiPackerCbFlush);
+    crPackFlushArg(&pPacker->CrPacker, pPacker);
+//    crPackSendHugeFunc( thread->packer, packspuHuge );
+    return VINF_SUCCESS;
+}
+#endif
 
 static int vboxMpCrCtlAddRef(PVBOXMP_CRCTLCON pCrCtlCon)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.cpp

@@ -161 +161 @@
     KeAcquireSpinLock(&pHeap->HeapLock, &OldIrql);
     HGSMIHeapFree(&pHeap->Heap, pvBuffer);
+    KeReleaseSpinLock(&pHeap->HeapLock, OldIrql);
+}
+
+void* VBoxSHGSMIHeapBufferAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData)
+{
+    KIRQL OldIrql;
+    void* pvData;
+    Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+    KeAcquireSpinLock(&pHeap->HeapLock, &OldIrql);
+    pvData = HGSMIHeapBufferAlloc(&pHeap->Heap, cbData);
+    KeReleaseSpinLock(&pHeap->HeapLock, OldIrql);
+    if (!pvData)
+        WARN(("HGSMIHeapAlloc failed!"));
+    return pvData;
+}
+
+void VBoxSHGSMIHeapBufferFree(PVBOXSHGSMI pHeap, void *pvBuffer)
+{
+    KIRQL OldIrql;
+    Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+    KeAcquireSpinLock(&pHeap->HeapLock, &OldIrql);
+    HGSMIHeapBufferFree(&pHeap->Heap, pvBuffer);
     KeReleaseSpinLock(&pHeap->HeapLock, OldIrql);
 }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.h

@@ -58 +58 @@
 void* VBoxSHGSMIHeapAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData, uint8_t u8Channel, uint16_t u16ChannelInfo);
 void VBoxSHGSMIHeapFree(PVBOXSHGSMI pHeap, void *pvBuffer);
+void* VBoxSHGSMIHeapBufferAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData);
+void VBoxSHGSMIHeapBufferFree(PVBOXSHGSMI pHeap, void *pvBuffer);
 void* VBoxSHGSMICommandAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData, uint8_t u8Channel, uint16_t u16ChannelInfo);
 void VBoxSHGSMICommandFree(PVBOXSHGSMI pHeap, void *pvBuffer);

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

@@ -35 +35 @@
 #include "wined3d_private.h"
 
+#define GLINFO_LOCATION      (This->resource.device->adapter->gl_info)
+
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);
 
@@ -100 +102 @@
 
 /* A GL context is provided by the caller */
-static void gltexture_delete(struct gl_texture *tex)
+static void gltexture_delete(IWineD3DTextureImpl *This, struct gl_texture *tex)
 {
     ENTER_GL();
-    glDeleteTextures(1, &tex->name);
+    texture_gl_delete(This, tex->name);
     LEAVE_GL();
     tex->name = 0;
@@ -112 +114 @@
     IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface;
     IWineD3DDeviceImpl *device = This->resource.device;
-
-#ifdef VBOX_WITH_WDDM
-    if (!VBOXSHRC_CAN_DELETE(device, This))
-    {
-        This->baseTexture.texture_rgb.name = 0;
-        This->baseTexture.texture_srgb.name = 0;
-    }
-    else
-#endif
-    {
-        struct wined3d_context *context = NULL;
-        if (This->baseTexture.texture_rgb.name || This->baseTexture.texture_srgb.name)
-        {
-            context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
-        }
-
-        if(This->baseTexture.texture_rgb.name) {
-            gltexture_delete(&This->baseTexture.texture_rgb);
-        }
-        if(This->baseTexture.texture_srgb.name) {
-            gltexture_delete(&This->baseTexture.texture_srgb);
-        }
-
-        if (context) context_release(context);
-    }
+    struct wined3d_context *context = NULL;
+    if (This->baseTexture.texture_rgb.name || This->baseTexture.texture_srgb.name)
+    {
+        context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
+    }
+
+    if(This->baseTexture.texture_rgb.name) {
+        gltexture_delete(This, &This->baseTexture.texture_rgb);
+    }
+    if(This->baseTexture.texture_srgb.name) {
+        gltexture_delete(This, &This->baseTexture.texture_srgb);
+    }
+
+    if (context) context_release(context);
 
     This->baseTexture.texture_rgb.dirty = TRUE;
@@ -296 +287 @@
     TRACE("(%p) : About to bind texture\n", This);
 
-#ifdef VBOX_WITH_WDDM
-    Assert(!VBOXSHRC_IS_DISABLED(This));
-#endif
-
     This->baseTexture.is_srgb = srgb; /* SRGB mode cache for PreLoad calls outside drawprim */
     if(srgb) {
@@ -317 +304 @@
             ERR("should not be here!");
             gl_tex->name = (GLuint)VBOXSHRC_GET_SHAREHANDLE(This);
+            GL_EXTCALL(glChromiumParameteriCR(GL_RCUSAGE_TEXTURE_SET_CR, gl_tex->name));
             TRACE("Assigned shared texture %d\n", gl_tex->name);
         }

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

@@ -6279 +6279 @@
     if (surface->texture_name)
     {
-#ifdef VBOX_WITH_WDDM
-# ifdef DEBUG_misha
-        /* shared case needs testing! */
-        Assert(!VBOXSHRC_IS_SHARED(surface));
-# endif
-        if (VBOXSHRC_CAN_DELETE(device, surface))
-#endif
-        {
-            struct wined3d_context *context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
-            ENTER_GL();
-            glDeleteTextures(1, &surface->texture_name);
-            LEAVE_GL();
-            context_release(context);
-        }
+        IWineD3DDeviceImpl *This = device; /* <- to make the below texture_gl_delete macro work and avoid other modifications */
+        struct wined3d_context *context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
+        ENTER_GL();
+        texture_gl_delete(surface, surface->texture_name);
+        LEAVE_GL();
+        context_release(context);
         surface->texture_name = 0;
         surface->Flags &= ~SFLAG_CLIENT;

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

@@ -296 +296 @@
     }
 
-    switch (enmState)
-    {
-        case VBOXWINEEX_SHRC_STATE_GL_DISABLE:
-            VBOXSHRC_SET_DISABLE(This);
-            break;
-        case VBOXWINEEX_SHRC_STATE_GL_DELETE:
-            VBOXSHRC_SET_DELETE(This);
-            break;
-        default:
-            ERR("invalid arg");
-            return E_INVALIDARG;
-    }
-
-    return WINED3D_OK;
-}
-#endif
+    return WINED3D_OK;
+}
+#endif

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

@@ -98 +98 @@
     ENTER_GL();
 
-    if (This->texture_name
-#ifdef VBOX_WITH_WDDM
-            && VBOXSHRC_CAN_DELETE(device, This)
-#endif
-            )
+    if (This->texture_name)
     {
         /* Release the OpenGL texture. */
         TRACE("Deleting texture %u.\n", This->texture_name);
-        glDeleteTextures(1, &This->texture_name);
+        texture_gl_delete(This, This->texture_name);
     }
 
@@ -528 +524 @@
     if (VBOXSHRC_IS_SHARED(surface))
     {
+        struct wined3d_context * context;
         Assert(shared_handle);
-        surface_shrc_unlock(surface);
         if (!VBOXSHRC_IS_SHARED_OPENED(surface))
         {
-            struct wined3d_context * context;
-
+            surface_shrc_unlock(surface);
             Assert(!(*shared_handle));
             *shared_handle = VBOXSHRC_GET_SHAREHANDLE(surface);
-
-            Assert(!device->isInDraw);
-
-            /* flush to ensure the texture is allocated before it is used by another
-             * process opening it */
-            context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
-            if (context->valid)
-            {
-                wglFlush();
-            }
-            else
-            {
-                ERR("invalid context!");
-            }
-            context_release(context);
         }
         else
         {
+            VBOXSHRC_UNLOCK(surface);
+            Assert(!VBOXSHRC_IS_LOCKED(surface));
+#ifdef DEBUG_misha
+            ERR("test this!");
+#endif
+            surface_setup_location_onopen(surface);
             Assert(*shared_handle);
             Assert(*shared_handle == VBOXSHRC_GET_SHAREHANDLE(surface));
         }
+
+        Assert(!device->isInDraw);
+
+        /* flush to ensure the texture is allocated/referenced before it is used/released by another
+         * process opening/creating it */
+        context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
+        if (context->valid)
+        {
+            wglFlush();
+        }
+        else
+        {
+            ERR("invalid context!");
+        }
+        context_release(context);
     }
     else
@@ -1459 +1460 @@
     if(!texture) {
         ENTER_GL();
-#ifdef VBOX_WITH_WDDM
-        if (VBOXSHRC_CAN_DELETE(device, This))
-#endif
-        {
-            glDeleteTextures(1, &This->texture_name);
-            glDeleteTextures(1, &This->texture_name_srgb);
-        }
+        texture_gl_delete(This, This->texture_name);
+        texture_gl_delete(This, This->texture_name_srgb);
         This->texture_name = 0;
         This->texture_name_srgb = 0;
@@ -1828 +1824 @@
     struct wined3d_format_desc desc;
     IWineD3DBaseTexture *baseTexture = NULL;
+    struct wined3d_context *context;
 
     d3dfmt_get_conv(This, TRUE, TRUE, &desc, &convert);
@@ -1840 +1837 @@
             /* @todo: this is not entirely correct: need to share this state among all instances of the given shared resource */
             texture_state_init((IWineD3DTexture*)baseTexture, &pTex->baseTexture.texture_rgb);
+            context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
+            ENTER_GL();
+            GL_EXTCALL(glChromiumParameteriCR(GL_RCUSAGE_TEXTURE_SET_CR, pTex->baseTexture.texture_rgb.name));
+            ENTER_GL();
+            context_release(context);
         }
         IWineD3DBaseTexture_Release(baseTexture);
     }
+    else
+    {
+        context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
+        ENTER_GL();
+        GL_EXTCALL(glChromiumParameteriCR(GL_RCUSAGE_TEXTURE_SET_CR, (GLuint)VBOXSHRC_GET_SHAREHANDLE(This)));
+        ENTER_GL();
+        context_release(context);
+    }
     This->Flags |= alloc_flag;
-
     This->texture_name = (GLuint)VBOXSHRC_GET_SHAREHANDLE(This);
 
@@ -2258 +2267 @@
 
 #ifdef VBOX_WITH_WDDM
-        surface_shrc_unlock(This);
+    surface_shrc_unlock(This);
 #endif
 
@@ -2269 +2278 @@
     struct wined3d_context *context;
 
+#ifdef VBOX_WITH_WDDM
+    if (VBOXSHRC_IS_SHARED(This))
+    {
+        ERR("surface_release_client_storage for shared resource! ignoring..");
+        return;
+    }
+#endif
+
     context = context_acquire(This->resource.device, NULL, CTXUSAGE_RESOURCELOAD);
 
     ENTER_GL();
     glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE);
-#ifdef VBOX_WITH_WDDM
-    if (!VBOXSHRC_IS_SHARED_OPENED(This))
-#endif
-    {
-        if(This->texture_name)
-        {
-            surface_bind_and_dirtify(This, FALSE);
-            glTexImage2D(This->texture_target, This->texture_level,
-                         GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
-        }
-        if(This->texture_name_srgb)
-        {
-            surface_bind_and_dirtify(This, TRUE);
-            glTexImage2D(This->texture_target, This->texture_level,
-                         GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
-        }
+    if(This->texture_name)
+    {
+        surface_bind_and_dirtify(This, FALSE);
+        glTexImage2D(This->texture_target, This->texture_level,
+                     GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+    }
+    if(This->texture_name_srgb)
+    {
+        surface_bind_and_dirtify(This, TRUE);
+        glTexImage2D(This->texture_target, This->texture_level,
+                     GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
     }
     glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
@@ -2869 +2881 @@
     IWineD3DBaseTexture *baseTexture = NULL;
 
-#ifdef VBOX_WITH_WDDM
-    Assert(!VBOXSHRC_IS_DISABLED(This));
-#endif
-
     TRACE("(%p)Checking to see if the container is a base texture\n", This);
     if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) {
@@ -2895 +2903 @@
                 if (VBOXSHRC_IS_SHARED_OPENED(This))
                 {
+                    struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info;
                     ERR("should not be here!");
                     *name = (GLuint)VBOXSHRC_GET_SHAREHANDLE(This);
+                    GL_EXTCALL(glChromiumParameteriCR(GL_RCUSAGE_TEXTURE_SET_CR, name));
                 }
                 else
@@ -5354 +5364 @@
 #ifdef VBOX_WITH_WDDM
 static HRESULT WINAPI IWineD3DSurfaceImpl_SetShRcState(IWineD3DSurface *iface, VBOXWINEEX_SHRC_STATE enmState) {
-    IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl*)iface;
-    IWineD3DBaseTextureImpl *texture = NULL;
-    struct wined3d_context *context = NULL;
     HRESULT hr;
-    unsigned int i;
-
-    if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture)))
-    {
-        /* this is a texture, check that the */
-        switch (enmState)
-        {
-            case VBOXWINEEX_SHRC_STATE_GL_DISABLE:
-                if (!VBOXSHRC_IS_DISABLED(texture))
-                {
-                    ERR("directly doing SetShRcState for texture surface not allowed!");
-                    return E_FAIL;
-                }
-                break;
-            case VBOXWINEEX_SHRC_STATE_GL_DELETE:
-                if (!VBOXSHRC_IS_DELETE(texture))
-                {
-                    ERR("directly doing SetShRcState for texture surface not allowed!");
-                    return E_FAIL;
-                }
-                break;
-            default:
-                ERR("invalid arg");
-                return E_INVALIDARG;
-        }
-
-        IWineD3DBaseTexture_Release((IWineD3DBaseTexture*)texture);
-    }
-
 
     hr = IWineD3DResourceImpl_SetShRcState((IWineD3DResource*)iface, enmState);
@@ -5393 +5371 @@
         ERR("IWineD3DResource_SetShRcState failed");
         return hr;
-    }
-
-    if (!texture)
-    {
-        if (!This->resource.device->isInDraw)
-        {
-            context = context_acquire(This->resource.device, NULL, CTXUSAGE_RESOURCELOAD);
-            if (!context)
-            {
-                ERR("zero context!");
-                return E_FAIL;
-            }
-
-            if (!context->valid)
-            {
-                ERR("context invalid!");
-                context_release(context);
-                return E_FAIL;
-            }
-        }
-
-        device_cleanup_durtify_texture_target(This->resource.device, This->texture_target);
-
-        if (context)
-            context_release(context);
     }
 

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

@@ -323 +323 @@
     TRACE("(%p) : relay to BaseTexture\n", This);
 
-#ifdef VBOX_WITH_WDDM
-    Assert(!VBOXSHRC_IS_DISABLED(This));
-#endif
-
     hr = basetexture_bind((IWineD3DBaseTexture *)iface, srgb, &set_gl_texture_desc);
     if (set_gl_texture_desc && SUCCEEDED(hr)) {
@@ -727 +723 @@
 #endif
 
-        if (!VBOXSHRC_IS_SHARED_OPENED(texture))
+        if (!VBOXSHRC_IS_SHARED(texture))
         {
             struct wined3d_context * context;
@@ -733 +729 @@
             Assert(!device->isInDraw);
 
-            /* flush to ensure the texture is allocated before it is used by another
-             * process opening it */
+            /* flush to ensure the texture is allocated/referenced before it is used/released by another
+             * process opening/creating it */
             context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
             if (context->valid)

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

@@ -19 +19 @@
 #define VBOXSHRC_F_SHARED              0x00000001 /* shared rc */
 #define VBOXSHRC_F_SHARED_OPENED       0x00000002 /* if set shared rc is opened, otherwise it is created */
-#define VBOXSHRC_F_GL_DISABLE          0x00000004 /* don't delete gl resources on d3d resource deletion */
-#define VBOXSHRC_F_GL_DELETE           0x00000008 /* don't delete gl resources on d3d resource deletion */
 
 #define VBOXSHRC_GET_SHAREFLAFS(_o) ((_o)->resource.sharerc_flags)
@@ -31 +29 @@
 #define VBOXSHRC_SET_SHARED(_o) (VBOXSHRC_GET_SHAREFLAFS(_o) |= VBOXSHRC_F_SHARED)
 #define VBOXSHRC_SET_SHARED_OPENED(_o) (VBOXSHRC_GET_SHAREFLAFS(_o) |= VBOXSHRC_F_SHARED_OPENED)
-#define VBOXSHRC_SET_DISABLE(_o) (VBOXSHRC_GET_SHAREFLAFS(_o) |= VBOXSHRC_F_GL_DISABLE)
-#define VBOXSHRC_SET_DELETE(_o) (VBOXSHRC_GET_SHAREFLAFS(_o) = (VBOXSHRC_GET_SHAREFLAFS(_o) | VBOXSHRC_F_GL_DELETE) & (~VBOXSHRC_F_GL_DISABLE))
 
 #define VBOXSHRC_IS_SHARED(_o) (!!(VBOXSHRC_GET_SHAREFLAFS(_o) & VBOXSHRC_F_SHARED))
 #define VBOXSHRC_IS_SHARED_OPENED(_o) (!!(VBOXSHRC_GET_SHAREFLAFS(_o) & VBOXSHRC_F_SHARED_OPENED))
 #define VBOXSHRC_IS_SHARED_UNLOCKED(_o) (VBOXSHRC_IS_SHARED(_o) && !VBOXSHRC_IS_LOCKED(_o))
-#define VBOXSHRC_IS_DISABLED(_o) ( \
-        VBOXSHRC_IS_SHARED(_o) \
-        && (VBOXSHRC_GET_SHAREFLAFS(_o) & VBOXSHRC_F_GL_DISABLE) \
-    )
-#define VBOXSHRC_IS_DELETE(_o) ( \
-        VBOXSHRC_IS_SHARED(_o) \
-        && (VBOXSHRC_GET_SHAREFLAFS(_o) & VBOXSHRC_F_GL_DELETE) \
-    )
-
-#define VBOXSHRC_CAN_DELETE(_d, _o) (!VBOXSHRC_IS_DISABLED(_o))
 
 #define VBOXSHRC_LOCK(_o) do{ \

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

@@ -3774 +3774 @@
         const PIXELFORMATDESCRIPTOR *ppfd);
 
+/*Global resource ids sharing*/
 #define GL_SHARE_CONTEXT_RESOURCES_CR 0x8B27
+/*do flush for the command buffer of a thread the context was previusly current for*/
 #define GL_FLUSH_ON_THREAD_SWITCH_CR  0x8B28
+/*report that the shared resource is used by this context, the parameter value is a texture name*/
+#define GL_RCUSAGE_TEXTURE_SET_CR     0x8B29
+/*report that the shared resource is no longer used by this context, the parameter value is a texture name*/
+#define GL_RCUSAGE_TEXTURE_CLEAR_CR   0x8B2A
+
 typedef void (WINE_GLAPI *PGLFNCHROMIUMPARAMETERUCR)(GLenum param, GLint value);
 

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

@@ -2012 +2012 @@
 void basetexture_unload(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
 
+#ifdef VBOX_WITH_WDDM
+#define texture_gl_delete(_o, _t) do { \
+        if (VBOXSHRC_IS_SHARED(_o)) GL_EXTCALL(glChromiumParameteriCR(GL_RCUSAGE_TEXTURE_CLEAR_CR, _t)); \
+        else glDeleteTextures(1, &_t);  \
+    } while (0)
+#else
+#define texture_gl_delete(_o, _t) do { \
+        glDeleteTextures(1, &_t);  \
+    } while (0)
+
+#endif
 /*****************************************************************************
  * IWineD3DTexture implementation structure (extends IWineD3DBaseTextureImpl)