case D3DFMT_DXT3:
case D3DFMT_DXT4:
case D3DFMT_DXT5:
- case D3DFMT_ATI1:
- case D3DFMT_ATI2:
- Width /= 4;
- Height /= 4;
+ Width = (Width + 3) / 4;
+ Height = (Height + 3) / 4;
+ break;
+
+ case D3DFMT_ATI1N:
+ case D3DFMT_ATI2N:
+ /*
+ * Because these are unsupported formats, RowPitch is not set to the
+ * number of bytes between row of blocks, but instead in such way that
+ * Height * RowPitch will match the expected size.
+ */
break;
case D3DFMT_UYVY:
case D3DFMT_R8G8_B8G8:
case D3DFMT_YUY2:
case D3DFMT_G8R8_G8B8:
- Width /= 2;
+ Width = (Width + 1) / 2;
break;
case D3DFMT_NV12:
#if DIRECT3D_VERSION >= 0x0900
-static inline size_t
-_getLockSize(IDirect3DVertexBuffer9 *pBuffer, UINT OffsetToLock, UINT SizeToLock, void ** ppbData) {
+static inline void
+_getLockInfo(IDirect3DVertexBuffer9 *pBuffer, UINT OffsetToLock, UINT SizeToLock, void ** ppbData,
+ void * & pLockedData, size_t & LockedSize) {
+ pLockedData = *ppbData;
+ LockedSize = 0;
+
if (SizeToLock == 0) {
D3DVERTEXBUFFER_DESC Desc;
HRESULT hr = pBuffer->GetDesc(&Desc);
if (FAILED(hr)) {
- return 0;
- }
- SizeToLock = Desc.Size;
+ return;
+ }
+ LockedSize = Desc.Size;
+ } else {
+ LockedSize = SizeToLock;
}
-
- return SizeToLock;
}
-static inline size_t
-_getLockSize(IDirect3DIndexBuffer9 *pBuffer, UINT OffsetToLock, UINT SizeToLock, void ** ppbData) {
+static inline void
+_getLockInfo(IDirect3DIndexBuffer9 *pBuffer, UINT OffsetToLock, UINT SizeToLock, void ** ppbData,
+ void * & pLockedData, size_t & LockedSize) {
+ pLockedData = *ppbData;
+ LockedSize = 0;
+
if (SizeToLock == 0) {
D3DINDEXBUFFER_DESC Desc;
HRESULT hr = pBuffer->GetDesc(&Desc);
if (FAILED(hr)) {
- return 0;
- }
- SizeToLock = Desc.Size;
+ return;
+ }
+ LockedSize = Desc.Size;
+ } else {
+ LockedSize = SizeToLock;
}
-
- return SizeToLock;
}
-static inline size_t
-_getLockSize(IDirect3DSurface9 *pSurface, const D3DLOCKED_RECT *pLockedRect, const RECT *pRect) {
+static inline void
+_getLockInfo(IDirect3DSurface9 *pSurface, const D3DLOCKED_RECT *pLockedRect, const RECT *pRect,
+ void * & pLockedData, size_t & LockedSize) {
+ pLockedData = pLockedRect->pBits;
+ LockedSize = 0;
+
HRESULT hr;
D3DSURFACE_DESC Desc;
hr = pSurface->GetDesc(&Desc);
if (FAILED(hr)) {
- return 0;
- }
+ return;
+ }
UINT Width;
UINT Height;
Height = Desc.Height;
}
- return _getLockSize(Desc.Format, Width, Height, pLockedRect->Pitch);
+ LockedSize = _getLockSize(Desc.Format, Width, Height, pLockedRect->Pitch);
}
-static inline size_t
-_getLockSize(IDirect3DTexture9 *pTexture, UINT Level, const D3DLOCKED_RECT *pLockedRect, const RECT *pRect) {
+static inline void
+_getLockInfo(IDirect3DTexture9 *pTexture, UINT Level, const D3DLOCKED_RECT *pLockedRect, const RECT *pRect,
+ void * & pLockedData, size_t & LockedSize) {
+ pLockedData = pLockedRect->pBits;
+ LockedSize = 0;
+
HRESULT hr;
D3DSURFACE_DESC Desc;
hr = pTexture->GetLevelDesc(Level, &Desc);
if (FAILED(hr)) {
- return 0;
+ return;
}
UINT Width;
Height = Desc.Height;
}
- return _getLockSize(Desc.Format, Width, Height, pLockedRect->Pitch);
+ LockedSize = _getLockSize(Desc.Format, Width, Height, pLockedRect->Pitch);
}
-static inline size_t
-_getLockSize(IDirect3DCubeTexture9 *pTexture, D3DCUBEMAP_FACES FaceType, UINT Level, const D3DLOCKED_RECT *pLockedRect, const RECT *pRect) {
+static inline void
+_getLockInfo(IDirect3DCubeTexture9 *pTexture, D3DCUBEMAP_FACES FaceType, UINT Level, const D3DLOCKED_RECT *pLockedRect, const RECT *pRect,
+ void * & pLockedData, size_t & LockedSize) {
+ pLockedData = pLockedRect->pBits;
+ LockedSize = 0;
+
HRESULT hr;
(void)FaceType;
D3DSURFACE_DESC Desc;
hr = pTexture->GetLevelDesc(Level, &Desc);
if (FAILED(hr)) {
- return 0;
+ return;
}
UINT Width;
Height = Desc.Height;
}
- return _getLockSize(Desc.Format, Width, Height, pLockedRect->Pitch);
+ LockedSize = _getLockSize(Desc.Format, Width, Height, pLockedRect->Pitch);
}
-static inline size_t
-_getLockSize(IDirect3DVolume9 *pVolume, const D3DLOCKED_BOX *pLockedBox, const D3DBOX *pBox) {
+static inline void
+_getLockInfo(IDirect3DVolume9 *pVolume, const D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox,
+ void * & pLockedData, size_t & LockedSize) {
+ pLockedData = pLockedVolume->pBits;
+ LockedSize = 0;
+
HRESULT hr;
D3DVOLUME_DESC Desc;
hr = pVolume->GetDesc(&Desc);
if (FAILED(hr)) {
- return 0;
+ return;
}
UINT Width;
Depth = Desc.Depth;
}
- return _getLockSize(Desc.Format, Width, Height, pLockedBox->RowPitch, Depth, pLockedBox->SlicePitch);
+ LockedSize = _getLockSize(Desc.Format, Width, Height, pLockedVolume->RowPitch, Depth, pLockedVolume->SlicePitch);
}
-static inline size_t
-_getLockSize(IDirect3DVolumeTexture9 *pTexture, UINT Level, const D3DLOCKED_BOX *pLockedBox, const D3DBOX *pBox) {
+static inline void
+_getLockInfo(IDirect3DVolumeTexture9 *pTexture, UINT Level, const D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox,
+ void * & pLockedData, size_t & LockedSize) {
+ pLockedData = pLockedVolume->pBits;
+ LockedSize = 0;
+
HRESULT hr;
D3DVOLUME_DESC Desc;
hr = pTexture->GetLevelDesc(Level, &Desc);
if (FAILED(hr)) {
- return 0;
+ return;
}
UINT Width;
Depth = Desc.Depth;
}
- return _getLockSize(Desc.Format, Width, Height, pLockedBox->RowPitch, Depth, pLockedBox->SlicePitch);
+ LockedSize = _getLockSize(Desc.Format, Width, Height, pLockedVolume->RowPitch, Depth, pLockedVolume->SlicePitch);
}