Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'glfw_header_order'

Browse Source 
5c12bf12 Fix OpenGL header order when testing GLFW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !778
This commit is contained in:
Robert Maynard 2017-05-24 18:18:06 +00:00 committed by Kitware Robot
commit 7e91ea248a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vtkm/rendering/testing/glfw/UnitTestMapperGLFW.cxx
View File

@ -17,9 +17,7 @@
// Laboratory (LANL), the U.S. Government retains certain rights in
// this software.
//============================================================================
#include <GLFW/glfw3.h>
#include <cstring>
#include <string>
#include <vtkm/Bounds.h>
#include <vtkm/cont/DeviceAdapter.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
@ -33,6 +31,13 @@
#include <vtkm/rendering/View3D.h>
#include <vtkm/rendering/testing/RenderTest.h>
// this needs to be included after the vtk-m headers so that we include
// the gl headers in the correct order
#include <GLFW/glfw3.h>
#include <cstring>
#include <string>
namespace {
static const vtkm::Id WIDTH = 512, HEIGHT = 512;
static vtkm::Id which = 0, NUM_DATASETS = 4;