Skip to content

Commit

Permalink
[d3d8] Cleanup texture and surface
Browse files Browse the repository at this point in the history
  • Loading branch information
AlpyneDreams committed Feb 23, 2023
1 parent 5a80ebd commit faff2d7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
9 changes: 0 additions & 9 deletions src/d3d8/d3d8_surface.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@

namespace dxvk {

struct D3D8_COMMON_TEXTURE_DESC;

using D3D8GDIDesc = D3DKMT_DESTROYDCFROMMEMORY;

// TODO: all inherited methods in D3D8Surface should be final like in d9vk

using D3D8SurfaceBase = D3D8Resource<d3d9::IDirect3DSurface9, IDirect3DSurface8>;
Expand Down Expand Up @@ -76,10 +72,5 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE ReleaseDC(HDC hDC) {
return GetD3D9()->ReleaseDC(hDC);
}

private:

D3D8GDIDesc m_dcDesc;

};
}
21 changes: 0 additions & 21 deletions src/d3d8/d3d8_texture.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,11 @@
#include "d3d8_d3d9_util.h"

#include <vector>
#include <list>
#include <mutex>
#include <new>
#include <type_traits>

namespace dxvk {

/**
* \brief Common texture description
*
* Contains all members that can be
* defined for 2D, Cube and 3D textures.
*/
struct D3D8_COMMON_TEXTURE_DESC {
UINT Width;
UINT Height;
UINT Depth;
UINT ArraySize;
UINT MipLevels;
DWORD Usage;
D3DFORMAT Format; // TODO: D3D8Format
D3DPOOL Pool;
BOOL Discard;
D3DMULTISAMPLE_TYPE MultiSample;
};


// Implements IDirect3DBaseTexture8 (Except GetType)
template <typename SubresourceType, typename D3D9, typename D3D8>
Expand Down

0 comments on commit faff2d7

Please sign in to comment.