Initial OpenGL commit

.gitignore

@@ -0,0 +1,7 @@
+.#.*
+*.kdev4
+
+.ccls-cache
+.kdev4
+bin
+obj

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "umake"]
+	path = umake
+	url = https://gitlab.com/corentin-pro/umake.git

include/glad/khrplatform.h

@@ -0,0 +1,290 @@
+#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
+
+#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 _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+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/graphic_context.hpp

@@ -0,0 +1,12 @@
+#pragma once
+
+// clang-format off
+#include "glad/glad.h"
+#define GLFW_INCLUDE_VULKAN
+#include <GLFW/glfw3.h>
+
+#define GLM_FORCE_RADIANS
+#define GLM_FORCE_DEPTH_ZERO_TO_ONE
+#include <glm/vec4.hpp>
+#include <glm/mat4x4.hpp>
+// clang-format off

include/uui/application.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <string>
+
+namespace uui
+{
+class Application
+{
+public:
+	virtual void run() = 0;
+	virtual void add_window(int width, int height, const std::string& title) = 0;
+};
+} // namespace uui

include/uui/opengl/application.hpp

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#include "graphic_context.hpp"
+#include "uui/application.hpp"
+#include "uui/window.hpp"
+
+namespace uui
+{
+
+class GlWindow;
+class GlApplication: public Application
+{
+	friend class GlWindow;
+
+public:
+	GlApplication();
+	~GlApplication();
+
+	void run();
+	void add_window(int width, int height, const std::string& title);
+
+private:
+	std::vector<std::unique_ptr<GlWindow>> windows;
+};
+
+class GlWindow: public Window
+{
+	friend class GlApplication;
+
+public:
+	GlWindow(const GlApplication& app, int width, int height, const std::string& title);
+	~GlWindow();
+
+private:
+	const GlApplication& app;
+
+	void draw();
+};
+
+} // namespace uui

include/uui/opengl/window.hpp

@@ -0,0 +1,3 @@
+#pragma once
+
+#include "uui/opengl/application.hpp"

include/uui/shader.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace uui
+{
+std::vector<char> readFile(const std::string& filename);
+}

include/uui/window.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <iostream>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include "graphic_context.hpp"
+
+class Window
+{
+public:
+	std::string title;
+
+	virtual void draw() = 0;
+
+protected:
+	GLFWwindow* glfw_window;
+};

make.py

@@ -0,0 +1,46 @@
+#! python3
+
+import os
+from pathlib import Path
+
+from umake import make
+
+
+class Config:
+    CC = 'g++'
+    APPS = ['test/example_gl']
+    IGNORE_APPS = []
+    JOB_COUNT = int(os.cpu_count() * 0.8)
+
+    BIN_DIR = Path('bin')
+    INCLUDE_DIR = Path('include')
+    OBJECT_DIR = Path('obj')
+    SOURCE_DIR = Path('src')
+
+    COMMON_FLAGS = '-std=c++17 -fno-semantic-interposition'
+    COMMON_DEBUG_FLAGS = '-g'
+    COMMON_RELEASE_FLAGS = '-O2'  # -flto'
+    COMPILE_FLAGS = f'-Wall -I{INCLUDE_DIR} `pkg-config --cflags glfw3 vulkan gl x11`'
+    LINK_FLAGS = '-lpthread -ldl `pkg-config --libs glfw3 vulkan gl x11`'
+
+    PRE_COMPILE_FUNCTION = None
+
+    CPP_SOURCES = [filepath for filepath in SOURCE_DIR.rglob('*.cpp') if not filepath.name.startswith('.')]
+
+
+def main():
+    def pre_compile():
+        # Compiling fragment shaders
+        for frag_path in Config.SOURCE_DIR.rglob('*.frag'):
+            out_path = (Config.BIN_DIR / frag_path.relative_to(Config.SOURCE_DIR))
+            if not out_path.parent.exists():
+                out_path.parent.mkdir(parents=True)
+            if subprocess.run(['glslc', str(frag_path), '-o', str(out_path) + '.spv']).returncode != 0:
+                print(f'Error while compiling fragment shader {frag_path}')
+                return
+    Config.PRE_COMPILE_FUNCTION = pre_compile
+    make(Config)
+
+
+if __name__ == '__main__':
+    main()

makefile

@@ -0,0 +1,13 @@
+MAKE_PATH="."
+UMAKE_PATH="umake"
+
+.PHONY: all clean
+
+all:
+	@PYTHONPATH=$(UMAKE_PATH) python $(MAKE_PATH)/make.py
+
+debug:
+	@PYTHONPATH=$(UMAKE_PATH) python $(MAKE_PATH)/make.py --type debug
+
+clean:
+	@PYTHONPATH=$(UMAKE_PATH) python $(MAKE_PATH)/make.py --clean

src/test/example_gl.cpp

@@ -0,0 +1,26 @@
+#include <iostream>
+
+#include "uui/opengl/application.hpp"
+
+using namespace std;
+
+int main()
+{
+	cout << "Example Staring" << endl;
+
+	try
+	{
+		uui::GlApplication app;
+		app.add_window(800, 600, "Vulkan!");
+		app.add_window(600, 600, "Vulkan 2!");
+		app.run();
+	}
+	catch(const std::exception& error)
+	{
+		std::cerr << error.what() << std::endl;
+		return EXIT_FAILURE;
+	}
+
+	cout << "Example done" << endl;
+	return 0;
+}

src/uui/opengl/application.cpp

@@ -0,0 +1,72 @@
+#include "uui/opengl/application.hpp"
+
+
+uui::GlApplication::GlApplication()
+{
+	// Init GLFW
+	glfwInit();
+	// Set all the required options for GLFW
+	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
+	glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+}
+
+uui::GlApplication::~GlApplication()
+{
+	glfwTerminate();
+}
+
+void uui::GlApplication::run()
+{
+	std::cout << "Starting the Application" << std::endl;
+
+	auto start_time = std::chrono::high_resolution_clock::now();
+	auto end_time = start_time;
+	float render_duration;
+	float frame_count = 0.0f;
+	std::cout << "\n";
+	while(!windows.empty())
+	{
+		end_time = std::chrono::high_resolution_clock::now();
+		render_duration = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time).count();
+		// std::cout << "Frame " << frame_count << ", duration: " << render_duration << std::endl;
+		if(frame_count > 0.0f && render_duration > 500.0f)
+		{
+			std::cout << "\rFPS : " << (frame_count * 1000.0f) / render_duration << "   "<< std::flush;
+			frame_count = 0.0f;
+			start_time = end_time;
+		}
+		glfwPollEvents();
+
+		// Destroying windows
+		for(auto it = windows.begin(); it != windows.end(); it += 1)
+		{
+			auto& window = *it;
+			if(glfwWindowShouldClose(window->glfw_window))
+			{
+				if(it == (windows.end() - 1) && windows.size() > 1)
+				{
+					glfwMakeContextCurrent((*(windows.end() - 2))->glfw_window);
+					glfwSwapInterval(1);
+				}
+				windows.erase(it);
+				it -= 1;
+			}
+			else
+				window->draw();
+		}
+		frame_count += 1;
+	}
+	std::cout << "Ending the Application" << std::endl;
+}
+
+void uui::GlApplication::add_window(int width, int height, const std::string& title)
+{
+	windows.push_back(std::make_unique<GlWindow>(*this, width, height, title));
+	glfwSwapInterval(1);
+	if(windows.size() > 1)
+	{
+		glfwMakeContextCurrent((*(windows.end() - 2))->glfw_window);
+		glfwSwapInterval(0);
+	}
+}

src/uui/opengl/window.cpp

@@ -0,0 +1,33 @@
+#include "uui/opengl/window.hpp"
+
+#include <iostream>
+
+uui::GlWindow::GlWindow(const uui::GlApplication& app, int width, int height, const std::string& title): app(app)
+{
+	std::cout << "Creating a Window" << std::endl;
+	this->title = title;
+
+	glfw_window = glfwCreateWindow(width, height, title.c_str(), NULL, NULL);
+	if(glfw_window == NULL)
+		throw std::runtime_error("GLWindow : failed to create GLFW window");
+
+	glfwMakeContextCurrent(glfw_window);
+	if(!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress))
+		throw std::runtime_error("GLWindow : Failed to initialize OpenGL context");
+	glViewport(0, 0, width, height);
+}
+
+uui::GlWindow::~GlWindow()
+{
+	std::cout << "Closing a Window" << std::endl;
+	glfwMakeContextCurrent(glfw_window);
+	glfwDestroyWindow(glfw_window);
+}
+
+void uui::GlWindow::draw()
+{
+	glfwMakeContextCurrent(glfw_window);
+	glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
+	glClear(GL_COLOR_BUFFER_BIT);
+	glfwSwapBuffers(glfw_window);
+}

src/uui/shader.cpp

@@ -0,0 +1,20 @@
+#include "uui/shader.hpp"
+
+#include <fstream>
+
+
+std::vector<char> uui::readFile(const std::string& filename)
+{
+	std::ifstream file(filename, std::ios::ate | std::ios::binary);
+
+	if(!file.is_open())
+		throw std::runtime_error("failed to open file!");
+
+	size_t fileSize = (size_t)file.tellg();
+	std::vector<char> buffer(fileSize);
+	file.seekg(0);
+	file.read(buffer.data(), fileSize);
+	file.close();
+
+	return buffer;
+}

umake

@@ -0,0 +1 @@
+Subproject commit f5965cc91e7eb27d1def78113301e7ec28fad54a