Backwards compatibility

example/matrix_transpose.cpp

@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
     kernel.set_arg(1, d_output);
 
     compute::event start;
-    start = queue.enqueue_nd_range_kernel(kernel, 2, 0, global_work_size, local_work_size);
+    start = queue.enqueue_nd_range_kernel_async(kernel, 2, 0, global_work_size, local_work_size);
     queue.finish();
     uint64_t elapsed = start.duration<boost::chrono::nanoseconds>().count();
 
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
     kernel.set_arg(0, d_input);
     kernel.set_arg(1, d_output);
 
-    start = queue.enqueue_nd_range_kernel(kernel, 2, 0, global_work_size, local_work_size);
+    start = queue.enqueue_nd_range_kernel_async(kernel, 2, 0, global_work_size, local_work_size);
     queue.finish();
     elapsed = start.duration<boost::chrono::nanoseconds>().count();
     std::cout << "  Elapsed: " << elapsed << " ns" << std::endl;
@@ -314,7 +314,7 @@ int main(int argc, char *argv[])
     kernel.set_arg(0, d_input);
     kernel.set_arg(1, d_output);
 
-    start = queue.enqueue_nd_range_kernel(kernel, 2, 0, global_work_size, local_work_size);
+    start = queue.enqueue_nd_range_kernel_async(kernel, 2, 0, global_work_size, local_work_size);
     queue.finish();
     elapsed = start.duration<boost::chrono::nanoseconds>().count();
     std::cout << "  Elapsed: " << elapsed << " ns" << std::endl;
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
     kernel.set_arg(0, d_input);
     kernel.set_arg(1, d_output);
 
-    start = queue.enqueue_nd_range_kernel(kernel, 2, 0, global_work_size, local_work_size);
+    start = queue.enqueue_nd_range_kernel_async(kernel, 2, 0, global_work_size, local_work_size);
     queue.finish();
     elapsed = start.duration<boost::chrono::nanoseconds>().count();
     std::cout << "  Elapsed: " << elapsed << " ns" << std::endl;

example/nbody.cpp

@@ -10,14 +10,9 @@
 
 #include <iostream>
 
-#define GL_GLEXT_PROTOTYPES
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
-#else
-#include <GL/gl.h>
-#include <GL/glext.h>
-#endif
+//#define GL_GLEXT_PROTOTYPES
+#include <boost/compute/interop/opengl/gl.hpp>
+#include <boost/compute/interop/opengl/cl_gl_ext.hpp>
 
 #include <QtGlobal>
 #if QT_VERSION >= 0x050000
@@ -193,8 +188,8 @@ void NBodyWidget::updateParticles()
 {
     // enqueue kernels to update particles and make sure that the command queue is finished
     compute::opengl_enqueue_acquire_buffer(m_position, m_queue);
-    m_queue.enqueue_1d_range_kernel(m_velocity_kernel, 0, m_particles, 0).wait();
-    m_queue.enqueue_1d_range_kernel(m_position_kernel, 0, m_particles, 0).wait();
+    m_queue.enqueue_1d_range_kernel_async(m_velocity_kernel, 0, m_particles, 0).wait();
+    m_queue.enqueue_1d_range_kernel_async(m_position_kernel, 0, m_particles, 0).wait();
     m_queue.finish();
     compute::opengl_enqueue_release_buffer(m_position, m_queue);
 }

include/boost/compute/algorithm/accumulate.hpp

@@ -11,6 +11,10 @@
 #ifndef BOOST_COMPUTE_ALGORITHM_ACCUMULATE_HPP
 #define BOOST_COMPUTE_ALGORITHM_ACCUMULATE_HPP
 
+#ifdef _WIN32
+#define NOMINMAX
+#endif
+
 #include <boost/preprocessor/seq/for_each.hpp>
 
 #include <boost/compute/system.hpp>

include/boost/compute/algorithm/copy.hpp

@@ -250,7 +250,7 @@ dispatch_copy_async(InputIterator first,
     }
 
     event event_ =
-        queue.enqueue_copy_buffer(
+		queue.enqueue_copy_buffer_async(
             first.get_buffer(),
             result.get_buffer(),
             first.get_index() * sizeof(value_type),

include/boost/compute/algorithm/fill.hpp

@@ -163,11 +163,11 @@ dispatch_fill_async(BufferIterator first,
     size_t offset = static_cast<size_t>(first.get_index());
 
     event event_ =
-        queue.enqueue_fill_buffer(first.get_buffer(),
-                                  &pattern,
-                                  sizeof(value_type),
-                                  offset * sizeof(value_type),
-                                  count * sizeof(value_type));
+		queue.enqueue_fill_buffer_async(first.get_buffer(),
+                                        &pattern,
+                                        sizeof(value_type),
+                                        offset * sizeof(value_type),
+                                        count * sizeof(value_type));
 
     return future<void>(event_);
 }