system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
wine/dlls/wined3d/volume.c

311 lines
12 KiB
C
Raw Normal View History

- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
/*
* IWineD3DVolume implementation
*
* Copyright 2002-2005 Jason Edmeades
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
* Copyright 2002-2005 Raphael Junqueira
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
* Copyright 2005 Oliver Stieber
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
#define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->wineD3DDevice)->wineD3D))->gl_info
/* *******************************************
IWineD3DVolume IUnknown parts follow
******************************************* */
HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, REFIID riid, LPVOID *ppobj)
{
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
Implemented guids for wined3d.
2005-03-02 13:44:58 +00:00
TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IWineD3DVolume)){
IUnknown_AddRef(iface);
*ppobj = This;
return D3D_OK;
}
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
return E_NOINTERFACE;
}
ULONG WINAPI IWineD3DVolumeImpl_AddRef(IWineD3DVolume *iface) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref);
return InterlockedIncrement(&This->resource.ref);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
}
ULONG WINAPI IWineD3DVolumeImpl_Release(IWineD3DVolume *iface) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
ULONG ref;
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref);
ref = InterlockedDecrement(&This->resource.ref);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
if (ref == 0) {
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
HeapFree(GetProcessHeap(), 0, This);
}
return ref;
}
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
/* ****************************************************
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
IWineD3DVolume IWineD3DResource parts follow
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
**************************************************** */
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
HRESULT WINAPI IWineD3DVolumeImpl_GetParent(IWineD3DVolume *iface, IUnknown **pParent) {
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
return IWineD3DResourceImpl_GetParent((IWineD3DResource *)iface, pParent);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
}
HRESULT WINAPI IWineD3DVolumeImpl_GetDevice(IWineD3DVolume *iface, IWineD3DDevice** ppDevice) {
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
return IWineD3DResourceImpl_GetDevice((IWineD3DResource *)iface, ppDevice);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
}
HRESULT WINAPI IWineD3DVolumeImpl_SetPrivateData(IWineD3DVolume *iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
return IWineD3DResourceImpl_SetPrivateData((IWineD3DResource *)iface, refguid, pData, SizeOfData, Flags);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
}
HRESULT WINAPI IWineD3DVolumeImpl_GetPrivateData(IWineD3DVolume *iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) {
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
return IWineD3DResourceImpl_GetPrivateData((IWineD3DResource *)iface, refguid, pData, pSizeOfData);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
}
HRESULT WINAPI IWineD3DVolumeImpl_FreePrivateData(IWineD3DVolume *iface, REFGUID refguid) {
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
return IWineD3DResourceImpl_FreePrivateData((IWineD3DResource *)iface, refguid);
}
DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD PriorityNew) {
return IWineD3DResourceImpl_SetPriority((IWineD3DResource *)iface, PriorityNew);
}
DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) {
return IWineD3DResourceImpl_GetPriority((IWineD3DResource *)iface);
}
void WINAPI IWineD3DVolumeImpl_PreLoad(IWineD3DVolume *iface) {
return IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
}
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
D3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *iface) {
return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface);
}
/* *******************************************
IWineD3DVolume parts follow
******************************************* */
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
TRACE("(%p) : returning %p\n", This, This->container);
*ppContainer = This->container;
IUnknown_AddRef(This->container);
return D3D_OK;
}
HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC* pDesc) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
TRACE("(%p) : copying into %p\n", This, pDesc);
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
*(pDesc->Format) = This->resource.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;
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
return D3D_OK;
}
HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
FIXME("(%p) : pBox=%p stub\n", This, pBox);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
/* fixme: should we really lock as such? */
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
TRACE("(%p) : box=%p, output pbox=%p, allMem=%p\n", This, pBox, pLockedVolume, This->resource.allocatedMemory);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
pLockedVolume->RowPitch = This->bytesPerPixel * This->currentDesc.Width; /* Bytes / row */
pLockedVolume->SlicePitch = This->bytesPerPixel * This->currentDesc.Width * This->currentDesc.Height; /* Bytes / slice */
if (!pBox) {
TRACE("No box supplied - all is ok\n");
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
pLockedVolume->pBits = This->resource.allocatedMemory;
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
This->lockedBox.Left = 0;
This->lockedBox.Top = 0;
This->lockedBox.Front = 0;
This->lockedBox.Right = This->currentDesc.Width;
This->lockedBox.Bottom = This->currentDesc.Height;
This->lockedBox.Back = This->currentDesc.Depth;
} else {
TRACE("Lock Box (%p) = l %d, t %d, r %d, b %d, fr %d, ba %d\n", pBox, pBox->Left, pBox->Top, pBox->Right, pBox->Bottom, pBox->Front, pBox->Back);
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
pLockedVolume->pBits = This->resource.allocatedMemory +
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
(pLockedVolume->SlicePitch * pBox->Front) + /* FIXME: is front < back or vica versa? */
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
(pLockedVolume->RowPitch * pBox->Top) +
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
(pBox->Left * This->bytesPerPixel);
This->lockedBox.Left = pBox->Left;
This->lockedBox.Top = pBox->Top;
This->lockedBox.Front = pBox->Front;
This->lockedBox.Right = pBox->Right;
This->lockedBox.Bottom = pBox->Bottom;
This->lockedBox.Back = pBox->Back;
}
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
if (Flags & (D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_READONLY)) {
/* Don't dirtify */
} else {
/**
* Dirtify on lock
* as seen in msdn docs
*/
IWineD3DVolume_AddDirtyBox(iface, &This->lockedBox);
/** Dirtify Container if needed */
if (NULL != This->container) {
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
IWineD3DVolumeTexture *cont = (IWineD3DVolumeTexture*) This->container;
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
D3DRESOURCETYPE containerType = IWineD3DBaseTexture_GetType((IWineD3DBaseTexture *) cont);
if (containerType == D3DRTYPE_VOLUMETEXTURE) {
IWineD3DBaseTextureImpl* pTexture = (IWineD3DBaseTextureImpl*) cont;
pTexture->baseTexture.dirty = TRUE;
} else {
FIXME("Set dirty on container type %d\n", containerType);
}
}
}
This->locked = TRUE;
TRACE("returning memory@%p rpitch(%d) spitch(%d)\n", pLockedVolume->pBits, pLockedVolume->RowPitch, pLockedVolume->SlicePitch);
return D3D_OK;
}
HRESULT WINAPI IWineD3DVolumeImpl_UnlockBox(IWineD3DVolume *iface) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
if (FALSE == This->locked) {
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
ERR("trying to lock unlocked volume@%p\n", This);
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
return D3DERR_INVALIDCALL;
}
TRACE("(%p) : unlocking volume\n", This);
This->locked = FALSE;
memset(&This->lockedBox, 0, sizeof(RECT));
return D3D_OK;
}
/* Internal use functions follow : */
HRESULT WINAPI IWineD3DVolumeImpl_CleanDirtyBox(IWineD3DVolume *iface) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
This->dirty = FALSE;
This->lockedBox.Left = This->currentDesc.Width;
This->lockedBox.Top = This->currentDesc.Height;
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
This->lockedBox.Front = This->currentDesc.Depth;
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
This->lockedBox.Right = 0;
This->lockedBox.Bottom = 0;
This->lockedBox.Back = 0;
return D3D_OK;
}
HRESULT WINAPI IWineD3DVolumeImpl_AddDirtyBox(IWineD3DVolume *iface, CONST D3DBOX* pDirtyBox) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
This->dirty = TRUE;
if (NULL != pDirtyBox) {
This->lockedBox.Left = min(This->lockedBox.Left, pDirtyBox->Left);
This->lockedBox.Top = min(This->lockedBox.Top, pDirtyBox->Top);
This->lockedBox.Front = min(This->lockedBox.Front, pDirtyBox->Front);
This->lockedBox.Right = max(This->lockedBox.Right, pDirtyBox->Right);
This->lockedBox.Bottom = max(This->lockedBox.Bottom, pDirtyBox->Bottom);
This->lockedBox.Back = max(This->lockedBox.Back, pDirtyBox->Back);
} else {
This->lockedBox.Left = 0;
This->lockedBox.Top = 0;
This->lockedBox.Front = 0;
This->lockedBox.Right = This->currentDesc.Width;
This->lockedBox.Bottom = This->currentDesc.Height;
This->lockedBox.Back = This->currentDesc.Depth;
}
return D3D_OK;
}
wined3d: Fix SetContainer. Add/Release references to the container. Change the type of the container from IUnknown to IWineD3DBase.
2006-02-06 10:30:48 +00:00
HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWineD3DBase* container) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
wined3d: Fix SetContainer. Add/Release references to the container. Change the type of the container from IUnknown to IWineD3DBase.
2006-02-06 10:30:48 +00:00
TRACE("This %p, container %p\n", This, container);
if (container) {
IWineD3DBase_AddRef(container);
}
if (This->container) {
IWineD3DBase_Release(This->container);
}
TRACE("Setting container to %p from %p\n", container, This->container);
This->container = container;
return D3D_OK;
Encapsulate texture, surface encapsulated. Added BindTexture, GetTextureDimensions, UnBindTexture. Proper GetContainer support for surface. SetContainer added to surface and volume. SetInPbufferState added to surface (until gl context management is implemented). Minor changes: - BaseTexture no longer 'holds' a reference to IWineD3DDevice to prevent circular referencing. - Better managment of referinging for texture. - Some TODO's for implementing a context manager. - Better preload implementation. - Fix compile warning in device.c Set/GetSamplerState. - Add QueryInterface support for surface. - Format X8R8G8B8 added to locking.
2005-03-14 10:12:52 +00:00
}
HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, GLenum gl_level) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice;
Encapsulate texture, surface encapsulated. Added BindTexture, GetTextureDimensions, UnBindTexture. Proper GetContainer support for surface. SetContainer added to surface and volume. SetInPbufferState added to surface (until gl context management is implemented). Minor changes: - BaseTexture no longer 'holds' a reference to IWineD3DDevice to prevent circular referencing. - Better managment of referinging for texture. - Some TODO's for implementing a context manager. - Better preload implementation. - Fix compile warning in device.c Set/GetSamplerState. - Add QueryInterface support for surface. - Format X8R8G8B8 added to locking.
2005-03-14 10:12:52 +00:00
TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n",
GL_TEXTURE_3D,
gl_level,
D3DFmt2GLIntFmt(myDevice, This->currentDesc.Format),
This->currentDesc.Width,
This->currentDesc.Height,
This->currentDesc.Depth,
0,
D3DFmt2GLFmt(myDevice, This->currentDesc.Format),
D3DFmt2GLType(myDevice, This->currentDesc.Format),
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
This->resource.allocatedMemory);
Encapsulate texture, surface encapsulated. Added BindTexture, GetTextureDimensions, UnBindTexture. Proper GetContainer support for surface. SetContainer added to surface and volume. SetInPbufferState added to surface (until gl context management is implemented). Minor changes: - BaseTexture no longer 'holds' a reference to IWineD3DDevice to prevent circular referencing. - Better managment of referinging for texture. - Some TODO's for implementing a context manager. - Better preload implementation. - Fix compile warning in device.c Set/GetSamplerState. - Add QueryInterface support for surface. - Format X8R8G8B8 added to locking.
2005-03-14 10:12:52 +00:00
glTexImage3D(GL_TEXTURE_3D,
gl_level,
D3DFmt2GLIntFmt(myDevice, This->currentDesc.Format),
This->currentDesc.Width,
This->currentDesc.Height,
This->currentDesc.Depth,
0,
D3DFmt2GLFmt(myDevice, This->currentDesc.Format),
D3DFmt2GLType(myDevice, This->currentDesc.Format),
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
This->resource.allocatedMemory);
Encapsulate texture, surface encapsulated. Added BindTexture, GetTextureDimensions, UnBindTexture. Proper GetContainer support for surface. SetContainer added to surface and volume. SetInPbufferState added to surface (until gl context management is implemented). Minor changes: - BaseTexture no longer 'holds' a reference to IWineD3DDevice to prevent circular referencing. - Better managment of referinging for texture. - Some TODO's for implementing a context manager. - Better preload implementation. - Fix compile warning in device.c Set/GetSamplerState. - Add QueryInterface support for surface. - Format X8R8G8B8 added to locking.
2005-03-14 10:12:52 +00:00
checkGLcall("glTexImage3D");
return D3D_OK;
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
Encapsulate texture, surface encapsulated. Added BindTexture, GetTextureDimensions, UnBindTexture. Proper GetContainer support for surface. SetContainer added to surface and volume. SetInPbufferState added to surface (until gl context management is implemented). Minor changes: - BaseTexture no longer 'holds' a reference to IWineD3DDevice to prevent circular referencing. - Better managment of referinging for texture. - Some TODO's for implementing a context manager. - Better preload implementation. - Fix compile warning in device.c Set/GetSamplerState. - Add QueryInterface support for surface. - Format X8R8G8B8 added to locking.
2005-03-14 10:12:52 +00:00
}
Make remaining OLE interface vtables const.
2005-06-06 19:50:35 +00:00
const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl =
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
{
Encapsulate texture, surface encapsulated. Added BindTexture, GetTextureDimensions, UnBindTexture. Proper GetContainer support for surface. SetContainer added to surface and volume. SetInPbufferState added to surface (until gl context management is implemented). Minor changes: - BaseTexture no longer 'holds' a reference to IWineD3DDevice to prevent circular referencing. - Better managment of referinging for texture. - Some TODO's for implementing a context manager. - Better preload implementation. - Fix compile warning in device.c Set/GetSamplerState. - Add QueryInterface support for surface. - Format X8R8G8B8 added to locking.
2005-03-14 10:12:52 +00:00
/* IUnknown */
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
IWineD3DVolumeImpl_QueryInterface,
IWineD3DVolumeImpl_AddRef,
IWineD3DVolumeImpl_Release,
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
/* IWineD3DResource */
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
IWineD3DVolumeImpl_GetParent,
IWineD3DVolumeImpl_GetDevice,
IWineD3DVolumeImpl_SetPrivateData,
IWineD3DVolumeImpl_GetPrivateData,
IWineD3DVolumeImpl_FreePrivateData,
- Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
IWineD3DVolumeImpl_SetPriority,
IWineD3DVolumeImpl_GetPriority,
IWineD3DVolumeImpl_PreLoad,
IWineD3DVolumeImpl_GetType,
/* IWineD3DVolume */
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
IWineD3DVolumeImpl_GetContainer,
IWineD3DVolumeImpl_GetDesc,
IWineD3DVolumeImpl_LockBox,
IWineD3DVolumeImpl_UnlockBox,
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
/* Internal interface */
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
IWineD3DVolumeImpl_AddDirtyBox,
Encapsulate texture, surface encapsulated. Added BindTexture, GetTextureDimensions, UnBindTexture. Proper GetContainer support for surface. SetContainer added to surface and volume. SetInPbufferState added to surface (until gl context management is implemented). Minor changes: - BaseTexture no longer 'holds' a reference to IWineD3DDevice to prevent circular referencing. - Better managment of referinging for texture. - Some TODO's for implementing a context manager. - Better preload implementation. - Fix compile warning in device.c Set/GetSamplerState. - Add QueryInterface support for surface. - Format X8R8G8B8 added to locking.
2005-03-14 10:12:52 +00:00
IWineD3DVolumeImpl_CleanDirtyBox,
IWineD3DVolumeImpl_LoadTexture,
IWineD3DVolumeImpl_SetContainer
- Add texture support for all the texture types for d3d9->wined3d. - Add prototypes for the COM interfaces. - Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
};
Reference in a new issue Copy permalink