From d9bbb0a115a3b8f33045ffb3c9029cb36ad9b42a Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 7 Oct 2019 20:07:45 -0700 Subject: D3D12 backend: cosmetic code changes + fixed clang build error --- Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp | 2 +- Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') 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(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(TexDesc.SampleCount > 1 ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D), pInitData, bIsDeviceInternal } -- cgit v1.2.3