diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-03-04 20:35:31 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-03-04 20:35:31 +0000 |
| commit | 4ce52374ba2cecc80669db630dfea6cf34f76965 (patch) | |
| tree | 5d5dfebbbca0f2a5df5f5c057f30d478be9d5921 /Tests/TestApp/src | |
| parent | Updated cmake files to handle the case when D3D12 is not supported on Win32 (diff) | |
| download | DiligentEngine-4ce52374ba2cecc80669db630dfea6cf34f76965.tar.gz DiligentEngine-4ce52374ba2cecc80669db630dfea6cf34f76965.zip | |
Enabled build with Win8.1 SDK
Replaced OPENGL_SUPPORTED macro with GL_SUPPORTED and GLES_SUPPORTED
Diffstat (limited to 'Tests/TestApp/src')
| -rw-r--r-- | Tests/TestApp/src/TestApp.cpp | 10 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestBufferCreation.cpp | 4 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestTextureCreation.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp index 49609c2..2e5509e 100644 --- a/Tests/TestApp/src/TestApp.cpp +++ b/Tests/TestApp/src/TestApp.cpp @@ -37,7 +37,7 @@ # include "RenderDeviceFactoryD3D12.h" #endif -#if OPENGL_SUPPORTED +#if GL_SUPPORTED || GLES_SUPPORTED # include "RenderDeviceFactoryOpenGL.h" #endif @@ -51,8 +51,8 @@ #include "TestRasterizerState.h" #include "TestBlendState.h" #include "TestVPAndSR.h" -#if OPENGL_SUPPORTED -#include "ShaderConverterTest.h" +#if GL_SUPPORTED || GLES_SUPPORTED + #include "ShaderConverterTest.h" #endif #include "TestCopyTexData.h" #include "PlatformMisc.h" @@ -127,7 +127,7 @@ void TestApp::InitializeDiligentEngine( break; #endif -#if OPENGL_SUPPORTED +#if GL_SUPPORTED || GLES_SUPPORTED case DeviceType::OpenGL: case DeviceType::OpenGLES: { @@ -184,7 +184,7 @@ void TestApp::InitializeRenderers() m_pTestShaderResArrays.reset(new TestShaderResArrays(m_pDevice, m_pImmediateContext, bUseOpenGL, 0.4f, -0.9f, 0.5f, 0.5f)); m_pMTResCreationTest.reset(new MTResourceCreationTest(m_pDevice, m_pImmediateContext, 7)); -#if OPENGL_SUPPORTED +#if GL_SUPPORTED || GLES_SUPPORTED ShaderConverterTest ConverterTest(m_pDevice, m_pImmediateContext); #endif TestSamplerCreation TestSamplers(m_pDevice); diff --git a/Tests/TestApp/src/TestBufferCreation.cpp b/Tests/TestApp/src/TestBufferCreation.cpp index 872f4bd..f0f5b3d 100644 --- a/Tests/TestApp/src/TestBufferCreation.cpp +++ b/Tests/TestApp/src/TestBufferCreation.cpp @@ -32,7 +32,7 @@ #include "TestCreateObjFromNativeResD3D12.h" #endif -#if OPENGL_SUPPORTED +#if GL_SUPPORTED || GLES_SUPPORTED #include "TestCreateObjFromNativeResGL.h" #endif @@ -58,7 +58,7 @@ TestBufferCreation::TestBufferCreation(Diligent::IRenderDevice *pDevice, Diligen break; #endif -#if OPENGL_SUPPORTED +#if GL_SUPPORTED || GLES_SUPPORTED case DeviceType::OpenGL: case DeviceType::OpenGLES: pTestCreateObjFromNativeRes.reset(new TestCreateObjFromNativeResGL(pDevice)); diff --git a/Tests/TestApp/src/TestTextureCreation.cpp b/Tests/TestApp/src/TestTextureCreation.cpp index bb95e15..acaccaa 100644 --- a/Tests/TestApp/src/TestTextureCreation.cpp +++ b/Tests/TestApp/src/TestTextureCreation.cpp @@ -36,7 +36,7 @@ #include "TestCreateObjFromNativeResD3D12.h" #endif -#if OPENGL_SUPPORTED +#if GL_SUPPORTED || GLES_SUPPORTED #include "TestCreateObjFromNativeResGL.h" #endif @@ -68,7 +68,7 @@ public: break; #endif -#if OPENGL_SUPPORTED +#if GL_SUPPORTED || GLES_SUPPORTED case DeviceType::OpenGL: case DeviceType::OpenGLES: m_pTestCreateObjFromNativeRes.reset(new TestCreateObjFromNativeResGL(pDevice)); |