Initial commit

include/CL_Helpers.h

@@ -0,0 +1,36 @@
+#ifndef DEFINED_OpenCLHelpers_H
+#define DEFINED_OpenCLHelpers_H
+
+
+
+#if defined(__APPLE__) || defined(__MACOSX)
+#	include <OpenCL/cl.h>
+#	include <OpenCL/cl_platform.h>
+#	include <OpenCL/cl_ext.h>
+#	include <OpenCL/cl_gl.h>
+#	include <OpenCL/cl_gl_ext.h>
+#else
+#	include <CL/cl.h>
+#	include <CL/cl_platform.h>
+#	include <CL/cl_ext.h>
+#	include <CL/cl_gl.h>
+#	include <CL/cl_gl_ext.h>
+#endif
+
+//#define CL_HPP_ENABLE_EXCEPTIONS
+#define CL_HPP_MINIMUM_OPENCL_VERSION 110
+#define CL_HPP_TARGET_OPENCL_VERSION 110
+#define CL_HPP_ENABLE_SIZE_T_COMPATIBILITY
+
+#include "CL/cl2.hpp" // local instance of cl2.hpp
+#include <memory>
+#include <algorithm>
+
+#include <iostream> // For printing information to the console
+#include <fstream>  // For reading shader files
+#include <vector>
+#include <sstream>
+
+extern std::string ClErrorToString(cl_int err);
+
+#endif

include/GpuApplication.h

@@ -0,0 +1,192 @@
+#ifndef GPU_APPLICATION_H
+#define GPU_APPLICATION_H
+
+#include <glad/glad.h>
+#include <GLFW/glfw3.h> // needs to be after glad.h
+#include <iostream>
+#include <string>
+#include <stdio.h>
+#include <chrono>
+#include "shader.h"
+#include "CL_Helpers.h"
+
+// Interface
+class GPUApplication
+{
+public:
+	virtual bool InitGL() = 0;
+	virtual void Run() = 0;
+	virtual void Cleanup() = 0;
+	std::string kernelFile;
+
+protected:
+	cl::Platform platform;
+	cl::Device device;
+	cl::Context context;
+	cl::CommandQueue queue;
+	cl::Program program;
+
+public:
+	bool GPUApplication::InitCL() {
+		// Find a combination of a cl::Platform and cl::Device to run OpenCL
+		// -----------------------------------------------------------------
+		{
+			std::vector<std::pair<cl::Platform, cl::Device>> foundPlatformDeviceCombinations;
+			bool found = false;
+			std::stringstream setupOutput;
+			std::vector<cl::Platform> allPlatforms;
+			cl::Platform::get(&allPlatforms);
+			std::vector<cl_device_type> deviceTypes;
+
+#if !defined(__APPLE__) && !defined(__MACOSX)
+			deviceTypes.push_back(CL_DEVICE_TYPE_ACCELERATOR);
+			deviceTypes.push_back(CL_DEVICE_TYPE_CPU);
+#endif
+			deviceTypes.push_back(CL_DEVICE_TYPE_GPU);
+
+			setupOutput << "Found the following platforms and devices:" << std::endl;
+			for (auto& p : allPlatforms)
+			{
+				std::string pname = p.getInfo<CL_PLATFORM_NAME>();
+				if (pname.find("Clover") == std::string::npos)
+				{
+					std::string platver = p.getInfo<CL_PLATFORM_VERSION>();
+					setupOutput << "  - Platform name:    " << pname << std::endl;
+					setupOutput << "        Platform version:   " << platver << std::endl;
+
+					for (auto& devType : deviceTypes)
+					{
+						std::vector<cl::Device> devices;
+						p.getDevices(devType, &devices);
+						if (devices.size())
+						{
+							setupOutput << "        Device name:        " << devices[0].getInfo< CL_DEVICE_NAME>() << std::endl;
+							foundPlatformDeviceCombinations.push_back(std::pair<cl::Platform, cl::Device>(p, devices[0]));
+						}
+					}
+				}
+			}
+
+			if (foundPlatformDeviceCombinations.size() == 0)
+			{
+				std::cout << "Error: no OpenCL platform-device combination found.\n";
+				return false;
+			}
+			std::cout << setupOutput.str();
+
+			// Choose here which combination you would like to use
+			// ---------------------------------------------------
+			int idxOfPlatformAndDevice = 0;
+			platform = foundPlatformDeviceCombinations[idxOfPlatformAndDevice].first;
+			device = foundPlatformDeviceCombinations[idxOfPlatformAndDevice].second;
+			if ((cl::Platform::setDefault(platform) != platform) || (cl::Device::setDefault(device) != device)) {
+				std::cout << "Error: could not set the default platform/devide" << std::endl;
+				return false;
+			}
+			std::cout << "Picked combination " << idxOfPlatformAndDevice << ", i.e. "
+				<< platform.getInfo<CL_PLATFORM_NAME>() << ", "
+				<< platform.getInfo<CL_PLATFORM_VERSION>() << ", "
+				<< device.getInfo< CL_DEVICE_NAME>() << std::endl;
+		}
+
+
+		// Setup cl::Context and cl::CommandQueue
+		// --------------------------------------
+		//cl::Context context; // necessary to manage objects such as CommandQueues, memory, program, kernel objects and for executing kernels on 1/more devices specified in the Context
+		//cl::CommandQueue queue; // necessary to push command onto the device
+		{
+			cl_int err = CL_SUCCESS;
+			context = cl::Context(device, NULL, NULL, NULL, &err);
+			if ((context() == 0) || (err != CL_SUCCESS)) {
+				std::cout << "Error: failed to create the context. Bad installation?" << std::endl;
+				if (err != CL_SUCCESS) std::cout << "   " << ClErrorToString(err) << std::endl;
+				return false;
+			}
+
+			queue = cl::CommandQueue(context, device, 0, &err);
+			if ((queue() == 0) || (err != CL_SUCCESS)) {
+				std::cout << "Error: failed to create the queue. Bad installation?" << std::endl;
+				if (err != CL_SUCCESS) std::cout << "   " << ClErrorToString(err) << std::endl;
+				return false;
+			}
+
+			if ((cl::Context::setDefault(context) != context) || (cl::CommandQueue::setDefault(queue) != queue)) {
+				std::cout << "Error: could not set the default context/commandqueue" << std::endl;
+				return false;
+			}
+		}
+
+
+		// Compile and build the kernel
+		// --------------------------------------
+		std::ifstream ifs(kernelFile.c_str());
+		const std::string kernel_code((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
+		if (kernel_code.size() == 0) {
+			std::cout << "Error: failed to read file " << kernelFile << std::endl;
+			return false;
+		}
+
+		cl::Program::Sources sources;
+		sources.push_back({ kernel_code.c_str(),kernel_code.length() });
+		// Program links source code to context
+		program = cl::Program(context, sources);
+
+		// build source code
+		if (program.build() != CL_SUCCESS) {
+			std::cout << " Error building: " << program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(device) << "\n";
+			return false;
+		}
+
+		return true;
+	}
+
+};
+
+// Child classes
+class GpuSimpleAdd : public GPUApplication {
+public:
+	GpuSimpleAdd(std::string kernelFile);
+	bool InitGL() override;
+	void Run() override;
+	void Cleanup() override;
+};
+
+class GpuPerlinNoise : public GPUApplication {
+public:
+	GpuPerlinNoise(std::string kernelFile);
+	bool InitGL() override;
+	void Run() override;
+	void Cleanup() override;
+protected:
+	bool HandleUserInput();
+	GLFWwindow* window = NULL;
+	Shader shader;
+	GLuint VAO;
+	GLuint texture;
+	float elevation = 0;
+	float azimuth = 0;
+};
+
+class GpuParticleSystem : public GPUApplication {
+public:
+	GpuParticleSystem(std::string kernelFile);
+	bool InitGL() override;
+	void Run() override;
+	void Cleanup() override;
+protected:
+	void InitPosVel();
+	bool HandleUserInput();
+	GLFWwindow* window = NULL;
+	Shader shader;
+	GLuint VAO = 0;
+	GLuint VBOs[2] = { 0 , 0 };
+	int nrParticles = 2000;
+	std::vector<float> positions;
+	std::vector<float> velocities;
+	bool reset = false;
+	float cursorX = 0;
+	float cursorY = 0;
+};
+
+
+#endif

include/KHR/khrplatform.h

@@ -0,0 +1,311 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2018 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * The master copy of khrplatform.h is maintained in the Khronos EGL
+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
+ * The last semantic modification to khrplatform.h was at commit ID:
+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by filing pull requests or issues on
+ * the EGL Registry repository linked above.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
+#   define KHRONOS_STATIC 1
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(KHRONOS_STATIC)
+    /* If the preprocessor constant KHRONOS_STATIC is defined, make the
+     * header compatible with static linking. */
+#   define KHRONOS_APICALL
+#elif defined(_WIN32)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+#   define KHRONOS_APICALL __attribute__((visibility("default")))
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+/*
+ * To support platform where unsigned long cannot be used interchangeably with
+ * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
+ * Ideally, we could just use (u)intptr_t everywhere, but this could result in
+ * ABI breakage if khronos_uintptr_t is changed from unsigned long to
+ * unsigned long long or similar (this results in different C++ name mangling).
+ * To avoid changes for existing platforms, we restrict usage of intptr_t to
+ * platforms where the size of a pointer is larger than the size of long.
+ */
+#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
+#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
+#define KHRONOS_USE_INTPTR_T
+#endif
+#endif
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef KHRONOS_USE_INTPTR_T
+typedef intptr_t               khronos_intptr_t;
+typedef uintptr_t              khronos_uintptr_t;
+#elif defined(_WIN64)
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+#endif
+
+#if defined(_WIN64)
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */

include/shader.h

@@ -0,0 +1,182 @@
+#ifndef SHADER_H
+#define SHADER_H
+
+
+//#include <glad/glad.h>
+//#include <GLFW/glfw3.h>
+
+#include <string>
+#include <fstream>
+#include <sstream>
+#include <iostream>
+#include <unordered_map>
+
+class Shader
+{
+private:
+	unsigned int ID;
+	mutable std::unordered_map<std::string, GLint> uniformLocationMap;
+
+public:
+	Shader() {
+		ID = 0;
+	}
+	// constructor generates the shader on the fly
+	// ------------------------------------------------------------------------
+	bool init(const char* vertexPath, const char* fragmentPath, const char* geometryPath = nullptr)
+	{
+		// 1. retrieve the vertex/fragment source code from filePath
+		std::string vertexCode;
+		std::string fragmentCode;
+		std::string geometryCode;
+		std::ifstream vShaderFile;
+		std::ifstream fShaderFile;
+		std::ifstream gShaderFile;
+		// ensure ifstream objects can throw exceptions:
+		vShaderFile.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+		fShaderFile.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+		gShaderFile.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+		try
+		{
+			// open files
+			vShaderFile.open(vertexPath);
+			fShaderFile.open(fragmentPath);
+			std::stringstream vShaderStream, fShaderStream;
+			// read file's buffer contents into streams
+			vShaderStream << vShaderFile.rdbuf();
+			fShaderStream << fShaderFile.rdbuf();
+			// close file handlers
+			vShaderFile.close();
+			fShaderFile.close();
+			// convert stream into string
+			vertexCode = vShaderStream.str();
+			fragmentCode = fShaderStream.str();
+			// if geometry shader path is present, also load a geometry shader
+			if (geometryPath != nullptr)
+			{
+				gShaderFile.open(geometryPath);
+				std::stringstream gShaderStream;
+				gShaderStream << gShaderFile.rdbuf();
+				gShaderFile.close();
+				geometryCode = gShaderStream.str();
+			}
+		}
+		catch (std::ifstream::failure)
+		{
+			std::cout << "ERROR::SHADER::FILE_NOT_SUCCESFULLY_READ" << std::endl;
+			return false;
+		}
+		const char* vShaderCode = vertexCode.c_str();
+		const char* fShaderCode = fragmentCode.c_str();
+		// 2. compile shaders
+		unsigned int vertex, fragment;
+		// vertex shader
+		vertex = glCreateShader(GL_VERTEX_SHADER);
+		glShaderSource(vertex, 1, &vShaderCode, NULL);
+		glCompileShader(vertex);
+		if (!checkCompileErrors(vertex, "VERTEX")) {
+			return false;
+		}
+		// fragment Shader
+		fragment = glCreateShader(GL_FRAGMENT_SHADER);
+		glShaderSource(fragment, 1, &fShaderCode, NULL);
+		glCompileShader(fragment);
+		if (!checkCompileErrors(fragment, "FRAGMENT")) {
+			return false;
+		}
+		// if geometry shader is given, compile geometry shader
+		unsigned int geometry;
+		if (geometryPath != nullptr)
+		{
+			const char* gShaderCode = geometryCode.c_str();
+			geometry = glCreateShader(GL_GEOMETRY_SHADER);
+			glShaderSource(geometry, 1, &gShaderCode, NULL);
+			glCompileShader(geometry);
+			if (!checkCompileErrors(geometry, "GEOMETRY")) {
+				return false;
+			}
+		}
+		// shader Program
+		ID = glCreateProgram();
+		glAttachShader(ID, vertex);
+		glAttachShader(ID, fragment);
+		if (geometryPath != nullptr)
+			glAttachShader(ID, geometry);
+		glLinkProgram(ID);
+		if (!checkCompileErrors(ID, "PROGRAM")) {
+			return false;
+		}
+		// delete the shaders as they're linked into our program now and no longer necessery
+		glDeleteShader(vertex);
+		glDeleteShader(fragment);
+		if (geometryPath != nullptr)
+			glDeleteShader(geometry);
+		return true;
+
+	}
+	// activate the shader
+	// ------------------------------------------------------------------------
+	void use()
+	{
+		glUseProgram(ID);
+	}
+	// utility uniform functions
+	// ------------------------------------------------------------------------
+	GLint getUniformLocation(const std::string& name) const {
+		if (uniformLocationMap.find(name) != uniformLocationMap.end()) {
+			return uniformLocationMap[name];
+		}
+		GLint location = glGetUniformLocation(ID, name.c_str());
+		uniformLocationMap[name] = location;
+		return location;
+	}
+
+
+	void setBool(const std::string& name, bool value) const
+	{
+		glUniform1i(getUniformLocation(name), (int)value);
+	}
+	// ------------------------------------------------------------------------
+	void setInt(const std::string& name, int value) const
+	{
+		glUniform1i(getUniformLocation(name), value);
+	}
+	// ------------------------------------------------------------------------
+	void setFloat(const std::string& name, float value) const
+	{
+		glUniform1f(getUniformLocation(name), value);
+	}
+	// ------------------------------------------------------------------------
+	
+
+private:
+	// utility function for checking shader compilation/linking errors.
+	// ------------------------------------------------------------------------
+	bool checkCompileErrors(GLuint shader, std::string type)
+	{
+		GLint success;
+		GLchar infoLog[1024];
+		if (type != "PROGRAM")
+		{
+			glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
+			if (!success)
+			{
+				glGetShaderInfoLog(shader, 1024, NULL, infoLog);
+				std::cout << "ERROR::SHADER_COMPILATION_ERROR of type: " << type << "\n" << infoLog << "\n -- --------------------------------------------------- -- " << std::endl;
+				return false;
+			}
+		}
+		else
+		{
+			glGetProgramiv(shader, GL_LINK_STATUS, &success);
+			if (!success)
+			{
+				glGetProgramInfoLog(shader, 1024, NULL, infoLog);
+				std::cout << "ERROR::PROGRAM_LINKING_ERROR of type: " << type << "\n" << infoLog << "\n -- --------------------------------------------------- -- " << std::endl;
+				return false;
+			}
+		}
+		return true;
+	}
+};
+#endif