From 6f3a18a8057aceb0a113a5634ee8c1f1498c5576 Mon Sep 17 00:00:00 2001
From: bkaradzic <branimirkaradzic@gmail.com>
Date: Thu, 10 Oct 2013 22:57:42 -0700
Subject: [PATCH] Added delayed load for GLES dlls on Windows.
---
examples/common/entry/entry_windows.cpp | 2 ++
examples/runtime/.gitignore | 2 ++
premake/premake4.lua | 11 +++++++++++
src/renderer_d3d9.cpp | 7 -------
4 files changed, 15 insertions(+), 7 deletions(-)
create mode 100644 examples/runtime/.gitignore
diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp
index de3a05f3..8f7ba20c 100644
--- a/examples/common/entry/entry_windows.cpp
+++ b/examples/common/entry/entry_windows.cpp
@@ -151,6 +151,8 @@ namespace entry
int32_t run(int _argc, char** _argv)
{
+ SetDllDirectory(".");
+
HINSTANCE instance = (HINSTANCE)GetModuleHandle(NULL);
WNDCLASSEX wnd;
diff --git a/examples/runtime/.gitignore b/examples/runtime/.gitignore
new file mode 100644
index 00000000..85fb0ec6
--- /dev/null
+++ b/examples/runtime/.gitignore
@@ -0,0 +1,2 @@
+libEGL.dll
+libGLESv2.dll
diff --git a/premake/premake4.lua b/premake/premake4.lua
index 3d35af36..afd0897c 100644
--- a/premake/premake4.lua
+++ b/premake/premake4.lua
@@ -60,6 +60,17 @@ function exampleProject(_name, _uuid)
"example-common",
}
+ configuration { "vs*" }
+ links { -- this is needed only for testing with GLES2/3 on Windows with VS2008
+ "DelayImp",
+ }
+
+ configuration { "vs2010" }
+ linkoptions { -- this is needed only for testing with GLES2/3 on Windows with VS201x
+ "/DELAYLOAD:\"libEGL.dll\"",
+ "/DELAYLOAD:\"libGLESv2.dll\"",
+ }
+
configuration { "android*" }
kind "SharedLib"
targetextension ".so"
diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp
index d33de628..5d7fa637 100644
--- a/src/renderer_d3d9.cpp
+++ b/src/renderer_d3d9.cpp
@@ -397,13 +397,6 @@ namespace bgfx
, m_caps.VertexShaderVersion
, m_caps.PixelShaderVersion
);
- BGFX_FATAL(m_caps.MaxTextureWidth >= 2048 && m_caps.MaxTextureHeight >= 2048
- , Fatal::MinimumRequiredSpecs
- , "Maximum texture size is below 2048 (w: %d, h: %d)."
- , m_caps.MaxTextureWidth
- , m_caps.MaxTextureHeight
- );
-
BX_TRACE("Max vertex shader 3.0 instr. slots: %d", m_caps.MaxVertexShader30InstructionSlots);
BX_TRACE("Max vertex shader constants: %d", m_caps.MaxVertexShaderConst);
BX_TRACE("Max fragment shader 2.0 instr. slots: %d", m_caps.PS20Caps.NumInstructionSlots);