From 5d540169ac45c2ac196c3c26edb02f3b3f2b61a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Wed, 2 Sep 2015 16:53:08 -0700 Subject: [PATCH] Fixed build. --- src/glimports.h | 3 +++ src/renderer_d3d11.cpp | 2 +- src/renderer_gl.h | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/glimports.h b/src/glimports.h index e7cc3fc6..a38ec61a 100644 --- a/src/glimports.h +++ b/src/glimports.h @@ -446,6 +446,9 @@ GL_IMPORT_KHR__(true, PFNGLDEBUGMESSAGEINSERTPROC, glDebugMessag GL_IMPORT_KHR__(true, PFNGLDEBUGMESSAGECALLBACKPROC, glDebugMessageCallback); GL_IMPORT_KHR__(true, PFNGLGETDEBUGMESSAGELOGPROC, glGetDebugMessageLog); +GL_IMPORT______(true, PFNGLGETINTERNALFORMATIVPROC, glGetInternalformativ); +GL_IMPORT______(true, PFNGLGETINTERNALFORMATI64VPROC, glGetInternalformati64v); + # if BGFX_CONFIG_RENDERER_OPENGLES < 30 GL_IMPORT_OES__(true, PFNGLTEXIMAGE3DPROC, glTexImage3D); GL_IMPORT_OES__(true, PFNGLTEXSUBIMAGE3DPROC, glTexSubImage3D); diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index d33118fa..bfcb3698 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -1083,7 +1083,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); if (SUCCEEDED(hr) ) { m_infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_CORRUPTION, true); - m_infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, true); + m_infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, false); m_infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_WARNING, false); D3D11_INFO_QUEUE_FILTER filter; diff --git a/src/renderer_gl.h b/src/renderer_gl.h index 4955f0d2..6a17bc68 100644 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -757,6 +757,10 @@ typedef uint64_t GLuint64; # define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F #endif // GL_TEXTURE_CUBE_MAP_SEAMLESS +#ifndef GL_TEXTURE_2D_MULTISAMPLE +# define GL_TEXTURE_2D_MULTISAMPLE 0x9100 +#endif // GL_TEXTURE_2D_MULTISAMPLE + #ifndef GL_DRAW_INDIRECT_BUFFER # define GL_DRAW_INDIRECT_BUFFER 0x8F3F #endif // GL_DRAW_INDIRECT_BUFFER