summaryrefslogtreecommitdiff
path: root/src/FFT_Simulation_CPU_impl.h
diff options
context:
space:
mode:
authorJason Maskell <[email protected]>2016-05-25 16:02:23 +0200
committerJason Maskell <[email protected]>2016-05-25 16:02:23 +0200
commit69f624cfc22c361a8162f57df4a71e4324805717 (patch)
tree245e0e5ebcb120fc573eb44d82755c1456e0d519 /src/FFT_Simulation_CPU_impl.h
parentAdded OpenGL sample - compiles and runs but doesn't work. (diff)
downloadwaveworks_archive-69f624cfc22c361a8162f57df4a71e4324805717.tar.xz
waveworks_archive-69f624cfc22c361a8162f57df4a71e4324805717.zip
Excised D3D9 and 10 support from library.
Diffstat (limited to 'src/FFT_Simulation_CPU_impl.h')
-rw-r--r--src/FFT_Simulation_CPU_impl.h27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/FFT_Simulation_CPU_impl.h b/src/FFT_Simulation_CPU_impl.h
index a72a34b..2a0a725 100644
--- a/src/FFT_Simulation_CPU_impl.h
+++ b/src/FFT_Simulation_CPU_impl.h
@@ -62,8 +62,6 @@ public:
void OnCompleteSimulationStep(gfsdk_U64 kickID);
// Mandatory NVWaveWorks_FFT_Simulation interface
- HRESULT initD3D9(IDirect3DDevice9* pD3DDevice);
- HRESULT initD3D10(ID3D10Device* pD3DDevice);
HRESULT initD3D11(ID3D11Device* pD3DDevice);
HRESULT initGnm();
HRESULT initGL2(void* pGLContext);
@@ -73,8 +71,6 @@ public:
HRESULT addArchivedDisplacements(float coord, const gfsdk_float2* inSamplePoints, gfsdk_float4* outDisplacements, UINT numSamples);
HRESULT getTimings(NVWaveWorks_FFT_Simulation_Timings&) const;
gfsdk_U64 getDisplacementMapVersion() const { return m_DisplacementMapVersion; }
- LPDIRECT3DTEXTURE9 GetDisplacementMapD3D9();
- ID3D10ShaderResourceView** GetDisplacementMapD3D10();
ID3D11ShaderResourceView** GetDisplacementMapD3D11();
sce::Gnm::Texture* GetDisplacementMapGnm();
GLuint GetDisplacementMapGL2();
@@ -105,23 +101,6 @@ private:
// D3D API handling
nv_water_d3d_api m_d3dAPI;
-#if WAVEWORKS_ENABLE_D3D9
- struct D3D9Objects
- {
- IDirect3DDevice9* m_pd3d9Device;
- LPDIRECT3DTEXTURE9 m_pd3d9DisplacementMapTexture[2]; // (ABGR32F)
- };
-#endif
-
-#if WAVEWORKS_ENABLE_D3D10
- struct D3D10Objects
- {
- ID3D10Device* m_pd3d10Device;
- ID3D10Texture2D* m_pd3d10DisplacementMapTexture[2];
- ID3D10ShaderResourceView* m_pd3d10DisplacementMapTextureSRV[2]; // (ABGR32F)
- };
-#endif
-
#if WAVEWORKS_ENABLE_D3D11
struct D3D11Objects
{
@@ -155,12 +134,6 @@ private:
union
{
-#if WAVEWORKS_ENABLE_D3D9
- D3D9Objects _9;
-#endif
-#if WAVEWORKS_ENABLE_D3D10
- D3D10Objects _10;
-#endif
#if WAVEWORKS_ENABLE_D3D11
D3D11Objects _11;
#endif