Reveting to an older build. Something on the mac build stopped my card from running it.

Added camera class
Added a create_buffer method
Cleaned up much of the main function
Added Vector4 class, ported from sf::Vector3
Various other edits

src/CL_Wrapper.cpp

@@ -59,9 +59,8 @@ int CL_Wrapper::acquire_platform_and_device(){
     // falling back to the cpu with the fastest clock if we weren't able to find one
 
     device current_best_device;
-	current_best_device.type = 0; // Set this to -1 so the first run always selects a new device
-    current_best_device.clock_frequency = 0;
-    current_best_device.comp_units = 0;
+	current_best_device.type = -1; // Set this to -1 so the first run always selects a new device
+
 
     for (auto kvp: plt_ids){
 
@@ -87,7 +86,7 @@ int CL_Wrapper::acquire_platform_and_device(){
     platform_id = current_best_device.platform;
     device_id = current_best_device.id;
 
-    return 1;
+    return 0;
 };
 
 int CL_Wrapper::create_shared_context() {
@@ -241,7 +240,7 @@ int CL_Wrapper::store_buffer(cl_mem buffer, std::string buffer_name){
 
 int CL_Wrapper::run_kernel(std::string kernel_name, const int work_size){
 
-    const int WORKER_SIZE = 1;
+    const int WORKER_SIZE = 10;
     size_t global_work_size[1] = { static_cast<size_t>(work_size) };
 
     cl_kernel kernel = kernel_map.at(kernel_name);

src/TestPlatform.cpp

@@ -3,8 +3,6 @@
 #include <cstring>
 #include <iostream>
 #include <vector>
-#include <OpenCL/opencl.h>
-
 
 #ifdef linux
 
@@ -15,8 +13,8 @@
 #include <CL/opencl.h>
 
 #elif defined TARGET_OS_MAC
-#include <OpenGL/OpenGL.h>
-
+# include <OpenGL/OpenGL.h>
+# include <OpenCL/opencl.h>
 #endif
 
 
@@ -54,6 +52,7 @@ int IsExtensionSupported(
 
 inline int test_for_gl_cl_sharing() {
 
+
     int err = 0;
 
 #if defined (__APPLE__) || defined(MACOSX)

src/main.cpp

@@ -25,15 +25,15 @@
 #include <OpenCL/cl_ext.h>
 
 #endif
+#include "TestPlatform.cpp"
 #include "Map.h"
 #include "Curses.h"
 #include "util.hpp"
 #include "RayCaster.h"
 #include "CL_Wrapper.h"
 
-const int WINDOW_X = 200;
-const int WINDOW_Y = 200;
-const int WORK_SIZE = WINDOW_X * WINDOW_Y;
+const int WINDOW_X = 1000;
+const int WINDOW_Y = 1000;
 
 const int MAP_X = 1024;
 const int MAP_Y = 1024;
@@ -69,6 +69,7 @@ int main() {
 	sf::Texture t;
 
 	CL_Wrapper c;
+	query_platform_devices();
 	c.acquire_platform_and_device();
 	c.create_shared_context();
 	c.create_command_queue();
@@ -139,18 +140,19 @@ int main() {
         }
     }
 	std::cout << "done\n";
+    int ind = 367;
+    printf("%i === %f, %f, %f\n", ind, view_matrix[ind * 4 + 0], view_matrix[ind * 4 + 1], view_matrix[ind * 4 + 2]);
 
     cl_mem view_matrix_buff = clCreateBuffer(
             c.getContext(), CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR,
-            sizeof(float) * 4 * view_res.x * view_res.y, view_matrix, NULL
+            sizeof(float) * 3 * view_res.x * view_res.y, view_matrix, NULL
     );
 
-    //sf::Vector3f cam_dir(1.0f, 0.0f, 1.00f);
+    sf::Vector3f cam_dir(1.0f, 0.0f, 1.00f);
 
-    float cam_dir[] = {1.0f, 0.0f, 1.57f, 0.0f};
     cl_mem cam_dir_buff = clCreateBuffer(
             c.getContext(), CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR,
-            sizeof(float) * 4, cam_dir, NULL
+            sizeof(float) * 4, &cam_dir, NULL
     );
 
 
@@ -219,10 +221,9 @@ int main() {
 	c.set_kernel_arg("min_kern", 7, "light_count_buffer");
 	c.set_kernel_arg("min_kern", 8, "image_buffer");
 
+    const int size = WINDOW_X * WINDOW_Y;
 
-
-    s.setTexture(t, true);
-    s.setPosition(0, 0);
+    s.setTexture(t);
 
     // The step size in milliseconds between calls to Update()
     // Lets set it to 16.6 milliseonds (60FPS)
@@ -299,7 +300,7 @@ int main() {
 			cam_vec.x = -1;
 		}
         if (sf::Keyboard::isKeyPressed(sf::Keyboard::Left)) {
-            //cam_dir.z = -0.1f;
+            cam_dir.z = -0.1f;
         }
         if (sf::Keyboard::isKeyPressed(sf::Keyboard::Right)) {
             cam_vec.z = +0.1f;
@@ -317,15 +318,15 @@ int main() {
 
 				// Mouse movement
 				sf::Mouse::setPosition(fixed);
-				cam_dir[1] -= deltas.y / 300.0f;
-				cam_dir[2] -= deltas.x / 300.0f;
+				cam_dir.y -= deltas.y / 300.0f;
+				cam_dir.z -= deltas.x / 300.0f;
 			}
 		}
 		cam_pos.x += cam_vec.x / 1.0;
 		cam_pos.y += cam_vec.y / 1.0;
 		cam_pos.z += cam_vec.z / 1.0;
 
-		//std::cout << cam_vec.x << " : " << cam_vec.y << " : " << cam_vec.z << std::endl;
+		std::cout << cam_vec.x << " : " << cam_vec.y << " : " << cam_vec.z << std::endl;
 
 
         // Time keeping
@@ -363,7 +364,7 @@ int main() {
 		error = clEnqueueAcquireGLObjects(c.getCommandQueue(), 1, &image_buff, 0, 0, 0);
 		if (c.assert(error, "clEnqueueAcquireGLObjects"))
 			return -1;
-		c.run_kernel("min_kern", WORK_SIZE);
+		c.run_kernel("min_kern", size);
 
 		clFinish(c.getCommandQueue());
 
@@ -371,6 +372,7 @@ int main() {
 		if (c.assert(error, "clEnqueueReleaseGLObjects"))
 			return -1;
 
+        s.setPosition(0, 0);
         window.draw(s);
 		
 		fps.frame(delta_time);