瀏覽代碼

Fixed build.

Branimir Karadžić 10 年之前
父節點
當前提交
5d540169ac
共有 3 個文件被更改,包括 8 次插入1 次删除
  1. 3 0
      src/glimports.h
  2. 1 1
      src/renderer_d3d11.cpp
  3. 4 0
      src/renderer_gl.h

+ 3 - 0
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);

+ 1 - 1
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;

+ 4 - 0
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