volume.c

Timestamp:

Jul 21, 2009 9:16:52 AM (16 years ago)

Author:

vboxsync

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

50306

Message:

crOpenGL: update to wine 1.1.26

File:

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

-              r19678
+              r21731
 #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info
+/* Context activation is done by the caller. */
 static void volume_bind_and_dirtify(IWineD3DVolume *iface) {
     IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
 …
     TRACE("(%p) : copying into %p\n", This, pDesc);
+    *(pDesc->Format)  = This->resource.format_desc->format;
+    *(pDesc->Type)    = This->resource.resourceType;
+    *(pDesc->Usage)   = This->resource.usage;
+    *(pDesc->Pool)    = This->resource.pool;
+    *(pDesc->Size)    = This->resource.size; /* dx8 only */
+    *(pDesc->Width)   = This->currentDesc.Width;
+    *(pDesc->Height)  = This->currentDesc.Height;
+    *(pDesc->Depth)   = This->currentDesc.Depth;
+    pDesc->Format = This->resource.format_desc->format;
+    pDesc->Type = This->resource.resourceType;
+    pDesc->Usage = This->resource.usage;
+    pDesc->Pool = This->resource.pool;
+    pDesc->Size = This->resource.size; /* dx8 only */
+    pDesc->Width = This->currentDesc.Width;
+    pDesc->Height = This->currentDesc.Height;
+    pDesc->Depth = This->currentDesc.Depth;
     return WINED3D_OK;
+}
 …
+}
+/* Context activation is done by the caller. */
 static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) {
     IWineD3DVolumeImpl *This     = (IWineD3DVolumeImpl *)iface;

Note: See TracChangeset for help on using the changeset viewer.