diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
| commit | 2cc7fa27e57f1129d1f37ccb009563509ca25720 (patch) | |
| tree | 3c75e423b71e54f6f65ec085c5d3d190d9d0d1a9 /ports/openvdb/UseGLEWOnWindowsForViewer.patch | |
| parent | 3830517ec7519b823f5d8c404710889c6bd00278 (diff) | |
| parent | 2dfa568d186e4f0d199040929f9b3e44f27c8943 (diff) | |
| download | vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.tar.gz vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/5254
Diffstat (limited to 'ports/openvdb/UseGLEWOnWindowsForViewer.patch')
| -rw-r--r-- | ports/openvdb/UseGLEWOnWindowsForViewer.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/ports/openvdb/UseGLEWOnWindowsForViewer.patch b/ports/openvdb/UseGLEWOnWindowsForViewer.patch deleted file mode 100644 index bfa29c46c..000000000 --- a/ports/openvdb/UseGLEWOnWindowsForViewer.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/openvdb/viewer/ClipBox.h b/openvdb/viewer/ClipBox.h -index b792491..d2f50cc 100644 ---- a/openvdb/viewer/ClipBox.h -+++ b/openvdb/viewer/ClipBox.h -@@ -36,6 +36,8 @@ - #if defined(__APPLE__) || defined(MACOSX) - #include <OpenGL/gl.h> - #include <OpenGL/glu.h> -+#elif defined(WIN32) -+#include <GL/glew.h> - #else - #include <GL/gl.h> - #include <GL/glu.h> -diff --git a/openvdb/viewer/Font.h b/openvdb/viewer/Font.h -index 6e79704..566cfbd 100644 ---- a/openvdb/viewer/Font.h -+++ b/openvdb/viewer/Font.h -@@ -36,6 +36,8 @@ - #if defined(__APPLE__) || defined(MACOSX) - #include <OpenGL/gl.h> - #include <OpenGL/glu.h> -+#elif defined(WIN32) -+#include <GL/glew.h> - #else - #include <GL/gl.h> - #include <GL/glu.h> -diff --git a/openvdb/viewer/RenderModules.h b/openvdb/viewer/RenderModules.h -index f4745d9..339dfc3 100644 ---- a/openvdb/viewer/RenderModules.h -+++ b/openvdb/viewer/RenderModules.h -@@ -43,6 +43,8 @@ - #if defined(__APPLE__) || defined(MACOSX) - #include <OpenGL/gl.h> - #include <OpenGL/glu.h> -+#elif defined(WIN32) -+#include <GL/glew.h> - #else - #include <GL/gl.h> - #include <GL/glu.h> -diff --git a/openvdb/viewer/Viewer.cc b/openvdb/viewer/Viewer.cc -index 307aa2b..8b79358 100644 ---- a/openvdb/viewer/Viewer.cc -+++ b/openvdb/viewer/Viewer.cc -@@ -540,7 +540,15 @@ ViewerImpl::open(int width, int height) - std::shared_ptr<GLFWwindow> curWindow( - glfwGetCurrentContext(), glfwMakeContextCurrent); - glfwMakeContextCurrent(mWindow); -- BitmapFont13::initialize(); -+ BitmapFont13::initialize(); -+#ifdef WIN32 -+ if (glewInit() == GLEW_OK) { -+ OPENVDB_LOG_DEBUG_RUNTIME("initialized GLEW from thread " -+ << boost::this_thread::get_id()); -+ } else { -+ OPENVDB_LOG_ERROR("GLEW initialization failed"); -+ } -+#endif - } - } - mCamera->setWindow(mWindow); |