diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
| commit | 1908903508bf057ad05d8a344e5bc55477944cb6 (patch) | |
| tree | 2a23595f1e7d8cc9a6358bfd44a00eb7368d8a1b /ports/openvdb/UseGLEWOnWindowsForViewer.patch | |
| parent | b0a2ff18c9f2c9131aed131f5bf0d97c0e23da8e (diff) | |
| parent | 8564602d06d7c4ce236f96a4f0f3ba7c2d769cb0 (diff) | |
| download | vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.tar.gz vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802
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); |