summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineOpenGL
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-03-07 03:04:30 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-03-07 03:04:30 +0000
commit89f09f2ad5c12d9ca6f0fb317e12ad1779c76eb4 (patch)
tree4e048f5ce4e17632f673f4af85094543133a7a31 /Graphics/GraphicsEngineOpenGL
parentMerged var_type_refactor into master (diff)
downloadDiligentCore-89f09f2ad5c12d9ca6f0fb317e12ad1779c76eb4.tar.gz
DiligentCore-89f09f2ad5c12d9ca6f0fb317e12ad1779c76eb4.zip
Fixed issue with GLContextWindows
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
-rw-r--r--Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp b/Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp
index 36acb151..a8cd38ca 100644
--- a/Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp
@@ -26,6 +26,7 @@
#include "GLContextWindows.h"
#include "DeviceCaps.h"
#include "GLTypeConversions.h"
+#include "GraphicsAccessories.h"
namespace Diligent
{
@@ -88,7 +89,7 @@ namespace Diligent
LOG_INFO_MESSAGE( MessageSS.str().c_str() );
}
- GLContext::GLContext(const EngineGLCreateInfo& InitAttribs, DeviceCaps& DeviceCaps, const SwapChainDesc* pSCDesc) :
+ GLContext::GLContext(const EngineGLCreateInfo& InitAttribs, DeviceCaps& deviceCaps, const SwapChainDesc* pSCDesc) :
m_Context(0),
m_WindowHandleToDeviceContext(0)
{
@@ -276,16 +277,16 @@ namespace Diligent
if( glGetError() != GL_NO_ERROR )
LOG_ERROR_MESSAGE("Failed to enable SRGB framebuffers");
- DeviceCaps.DevType = DeviceType::OpenGL;
- DeviceCaps.MajorVersion = MajorVersion;
- DeviceCaps.MinorVersion = MinorVersion;
+ deviceCaps.DevType = DeviceType::OpenGL;
+ deviceCaps.MajorVersion = MajorVersion;
+ deviceCaps.MinorVersion = MinorVersion;
bool IsGL43OrAbove = MajorVersion >= 5 || MajorVersion == 4 && MinorVersion >= 3;
- auto &TexCaps = DeviceCaps.TexCaps;
+ auto &TexCaps = deviceCaps.TexCaps;
TexCaps.bTexture2DMSSupported = IsGL43OrAbove;
TexCaps.bTexture2DMSArraySupported = IsGL43OrAbove;
TexCaps.bTextureViewSupported = IsGL43OrAbove;
TexCaps.bCubemapArraysSupported = IsGL43OrAbove;
- DeviceCaps.bMultithreadedResourceCreationSupported = False;
+ deviceCaps.bMultithreadedResourceCreationSupported = False;
}
GLContext::~GLContext()