Holy hell, finally got this working with an R9 390 + Ubuntu.

This commit is contained in:
2017-11-15 23:07:50 -08:00
parent d3a9c95ef7
commit 2baabf5bc5
7 changed files with 26 additions and 17 deletions

View File

@@ -44,9 +44,9 @@ public:
static const int WINDOW_X = 1600;
static const int WINDOW_Y = 900;
static const int MAP_X = 32;
static const int MAP_Y = 32;
static const int MAP_Z = 32;
static const int MAP_X;
static const int MAP_Y;
static const int MAP_Z;
Application();
~Application();
@@ -92,4 +92,4 @@ private:
delta_time = 0.0,
accumulator_time = 0.0,
current_time = 0.0;
};
};

View File

@@ -3,10 +3,11 @@
#include <vector>
#include <iostream>
#include <map>
#include <GL/glew.h>
#include <string.h>
#include "LightController.h"
#include "Camera.h"
#include <GL/glew.h>
//#include <GL/glew.h>
#include <Application.h>
#include <unordered_map>
#include "Logger.h"
@@ -16,7 +17,10 @@
#ifdef linux
#include <CL/cl.h>
#include <CL/opencl.h>
#include <EGL/egl.h>
#include <GL/gl.h>
#include <GL/glx.h>
#include <GL/glu.h>
//#include <EGL/egl.h>
//#include <GL/glx.h>
#elif defined _WIN32

View File

@@ -20,7 +20,7 @@ public:
// =========== DEBUG =========== //
char* getDataPtr();
std::vector<std::tuple<sf::Vector3i, char>> ArrayMap::CastRayCharArray(
std::vector<std::tuple<sf::Vector3i, char>> CastRayCharArray(
char* map,
sf::Vector3i* map_dim,
sf::Vector2f* cam_dir,
@@ -32,4 +32,4 @@ private:
char *voxel_data;
sf::Vector3i dimensions;
};
};

View File

@@ -92,7 +92,7 @@ public:
static const uint64_t contour_pointer_mask = 0xFFFFFF00000000;
static const uint64_t contour_mask = 0xFF00000000000000;
std::vector<std::tuple<sf::Vector3i, char>> Octree::CastRayOctree(
std::vector<std::tuple<sf::Vector3i, char>> CastRayOctree(
sf::Vector2f cam_dir,
sf::Vector3f cam_pos
);