Merge branch 'master' into registration

Author: floe

examples/protonect/src/cpu_depth_packet_processor.cpp

@@ -32,6 +32,8 @@
 #include <iostream>
 #include <fstream>
 
+#include <limits>
+
 #if defined(WIN32)
 #define _USE_MATH_DEFINES
 #include <math.h>

examples/protonect/src/opencl_depth_packet_processor.cpp

@@ -42,6 +42,9 @@
 #ifdef __APPLE__
 #include <OpenCL/cl.hpp>
 #else
+#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
+#include <CL/cl.h>
+#undef CL_VERSION_1_2
 #include <CL/cl.hpp>
 #endif
 

examples/protonect/src/opengl_depth_packet_processor.cpp

@@ -278,12 +278,15 @@ struct Texture : public WithOpenGLBindings
     bindToUnit(GL_TEXTURE0);
     glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
     glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+    glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexImage2D(GL_TEXTURE_RECTANGLE, 0, FormatT::InternalFormat, width, height, 0, FormatT::Format, FormatT::Type, 0);
   }
 
   void upload()
   {
     bindToUnit(GL_TEXTURE0);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     glTexSubImage2D(GL_TEXTURE_RECTANGLE, /*level*/0, /*xoffset*/0, /*yoffset*/0, width, height, FormatT::Format, FormatT::Type, data);
   }
 

examples/protonect/src/test_opengl_depth_packet_processor.cpp

@@ -58,6 +58,9 @@ int main(int argc, char **argv) {
   glfwInit();
   glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
   glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+#ifdef __APPLE__
+  glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
+#endif
   glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
   glfwWindowHint(GLFW_RESIZABLE, GL_FALSE);