diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-10-08 03:07:45 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-10-08 03:07:45 +0000 |
| commit | d9bbb0a115a3b8f33045ffb3c9029cb36ad9b42a (patch) | |
| tree | a4ea203e305074efff1cefc402b9b21a7444974a /Graphics/GraphicsEngineOpenGL | |
| parent | OpenGL backend: cosmetic code changes (diff) | |
| download | DiligentCore-d9bbb0a115a3b8f33045ffb3c9029cb36ad9b42a.tar.gz DiligentCore-d9bbb0a115a3b8f33045ffb3c9029cb36ad9b42a.zip | |
D3D12 backend: cosmetic code changes + fixed clang build error
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp index a1a64000..7a5ce82e 100644 --- a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp @@ -46,7 +46,7 @@ Texture2DArray_OGL::Texture2DArray_OGL(IReferenceCounters* pRefCounters, TexViewObjAllocator, pDeviceGL, TexDesc, - TexDesc.SampleCount > 1 ? GL_TEXTURE_2D_MULTISAMPLE_ARRAY : GL_TEXTURE_2D_ARRAY, + static_cast<GLenum>(TexDesc.SampleCount > 1 ? GL_TEXTURE_2D_MULTISAMPLE_ARRAY : GL_TEXTURE_2D_ARRAY), pInitData, bIsDeviceInternal } diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp index a5d902a2..5f9acdeb 100644 --- a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp @@ -46,7 +46,7 @@ Texture2D_OGL::Texture2D_OGL( IReferenceCounters* pRefCounters, TexViewObjAllocator, pDeviceGL, TexDesc, - TexDesc.SampleCount > 1 ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D, + static_cast<GLenum>(TexDesc.SampleCount > 1 ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D), pInitData, bIsDeviceInternal } |
