Added EGL linking and useage for the linux cl_khr_gl_sharing
interaction. This still crashes on my machine but at least its getting closer to working. Fixed some warnings and errors while compiling with clang++
This commit is contained in:
@@ -15,7 +15,8 @@
|
||||
#ifdef linux
|
||||
#include <CL/cl.h>
|
||||
#include <CL/opencl.h>
|
||||
#include <GL/glx.h>
|
||||
#include <EGL/egl.h>
|
||||
//#include <GL/glx.h>
|
||||
|
||||
#elif defined _WIN32
|
||||
#include <CL/cl_gl.h>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include <filesystem>
|
||||
#include <experimental/filesystem>
|
||||
|
||||
class ConfigDB {
|
||||
|
||||
@@ -14,4 +14,4 @@ public:
|
||||
private:
|
||||
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ public:
|
||||
enum LogDest { STDOUT, FILE };
|
||||
|
||||
// Log auto, takes a string and the severity of the log level and either prints it or tosses it
|
||||
static void log(std::string log_string, LogLevel severity, uint32_t line_number = 0, char* file_name = nullptr);
|
||||
static void log(std::string log_string, LogLevel severity, uint32_t line_number = 0, const char* file_name = nullptr);
|
||||
|
||||
static void set_log_level(LogLevel log_level);
|
||||
static void set_log_destination(LogDest log_destination);
|
||||
|
||||
@@ -23,14 +23,14 @@ public:
|
||||
// Gets a voxel at the 3D position in the octree
|
||||
char getVoxel(sf::Vector3i pos);
|
||||
|
||||
std::vector<std::tuple<sf::Vector3i, char>> Map::CastRayOctree(
|
||||
std::vector<std::tuple<sf::Vector3i, char>> CastRayOctree(
|
||||
Octree *octree,
|
||||
sf::Vector3i* map_dim,
|
||||
sf::Vector2f* cam_dir,
|
||||
sf::Vector3f* cam_pos
|
||||
);
|
||||
|
||||
std::vector<std::tuple<sf::Vector3i, char>> Map::CastRayCharArray(
|
||||
std::vector<std::tuple<sf::Vector3i, char>> CastRayCharArray(
|
||||
char *map,
|
||||
sf::Vector3i* map_dim,
|
||||
sf::Vector2f* cam_dir,
|
||||
|
||||
Reference in New Issue
Block a user