The Vulkan is a Harsh Misstress.

.gitignore

@@ -0,0 +1,5 @@
+.idea
+cmake-build-debug/
+lib/duktape/
+lib/glad/
+

.gitmodules

@@ -5,3 +5,18 @@
 	path = vendor/glad
 	url = [email protected]:Dav1dde/glad.git
 	branch = master
+[submodule "tools/shaderc"]
+	path = lib/shaderc
+	url = [email protected]:google/shaderc.git
+[submodule "tools/googletest"]
+	path = lib/googletest
+	url = [email protected]:google/googletest.git
+[submodule "tools/glslang"]
+	path = lib/glslang
+	url = [email protected]:google/glslang.git
+[submodule "tools/spirv-tools"]
+	path = lib/spirv-tools
+	url = [email protected]:KhronosGroup/SPIRV-Tools.git
+[submodule "tools/spirv-headers"]
+	path = lib/spirv-headers
+	url = [email protected]:KhronosGroup/SPIRV-Headers.git

CMakeLists.txt

@@ -1,22 +1,49 @@
 cmake_minimum_required(VERSION 3.5)
 project(engine)
 
-find_package( PythonInterp 2.7 REQUIRED )
+find_package(PythonInterp 2.7 REQUIRED)
 include(CheckCCompilerFlag)
+include(ExternalProject)
 
 # Source: https://stackoverflow.com/a/33266748/1127064
 function(enable_c_compiler_flag_if_supported flag)
     string(FIND "${CMAKE_C_FLAGS}" "${flag}" flag_already_set)
-    if(flag_already_set EQUAL -1)
+    if (flag_already_set EQUAL -1)
         check_c_compiler_flag("${flag}" flag_supported)
-        if(flag_supported)
+        if (flag_supported)
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}" PARENT_SCOPE)
-        endif()
+        endif ()
         unset(flag_supported CACHE)
-    endif()
+    endif ()
 endfunction()
 
 
+# Build shaderc library for compiling glsl shaders
+set(SHADERC_SYMLINKS
+        ${CMAKE_SOURCE_DIR}/lib/shaderc/third_party/glslang
+        ${CMAKE_SOURCE_DIR}/lib/shaderc/third_party/googletest
+        ${CMAKE_SOURCE_DIR}/lib/shaderc/third_party/spirv-headers
+        ${CMAKE_SOURCE_DIR}/lib/shaderc/third_party/spirv-tools)
+add_custom_command(
+        OUTPUT ${SHADERC_SYMLINKS}
+        COMMAND ln -s ${CMAKE_SOURCE_DIR}/lib/glslang ${CMAKE_SOURCE_DIR}/lib/shaderc/third_party/glslang
+        COMMAND ln -s ${CMAKE_SOURCE_DIR}/lib/googletest ${CMAKE_SOURCE_DIR}/lib/shaderc/third_party/googletest
+        COMMAND ln -s ${CMAKE_SOURCE_DIR}/lib/spirv-headers ${CMAKE_SOURCE_DIR}/lib/shaderc/third_party/spirv-headers
+        COMMAND ln -s ${CMAKE_SOURCE_DIR}/lib/spirv-tools ${CMAKE_SOURCE_DIR}/lib/shaderc/third_party/spirv-tools
+)
+add_custom_target(shadercsymlinktarget
+        ALL
+        DEPENDS ${SHADERC_SYMLINKS})
+ExternalProject_Add(localshaderc
+        DEPENDS shadercsymlinktarget
+        PREFIX lib/shaderc
+        SOURCE_DIR ${CMAKE_SOURCE_DIR}/lib/shaderc/
+        CONFIGURE_COMMAND cmake -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/lib/shaderc/ -DCMAKE_BUILD_TYPE=Debug ${CMAKE_SOURCE_DIR}/lib/shaderc
+        BUILD_COMMAND make -j4
+        INSTALL_COMMAND make install
+        )
+link_directories(${CMAKE_BINARY_DIR}/lib/shaderc/lib/)
+include_directories(${CMAKE_BINARY_DIR}/lib/shaderc/include)
 
 # VENDOR DUKTAPE
 set(VENDOR_DUKTAPE_SOURCES ${CMAKE_SOURCE_DIR}/lib/duktape/duktape.c ${CMAKE_SOURCE_DIR}/lib/duktape/duktape.h ${CMAKE_SOURCE_DIR}/lib/duktape/duk_config.h ${CMAKE_SOURCE_DIR}/lib/duktape/duk_source_meta.json)
@@ -31,54 +58,91 @@ add_custom_target(localduktape
 
 set(VENDOR_GLAD_SOURCES ${CMAKE_SOURCE_DIR}/lib/glad/glad.c ${CMAKE_SOURCE_DIR}/lib/glad/glad.h)
 add_custom_command(
-	OUTPUT ${VENDOR_GLAD_SOURCES}
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/vendor/glad/
-	PRE_BUILD
-	COMMAND ${PYTHON_EXECUTABLE} -m glad --generator c --out-path ${CMAKE_SOURCE_DIR}/lib/glad/ --spec gl --omit-khrplatform --local-files
+        OUTPUT ${VENDOR_GLAD_SOURCES}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/vendor/glad/
+        PRE_BUILD
+        COMMAND ${PYTHON_EXECUTABLE} -m glad --generator c --out-path ${CMAKE_SOURCE_DIR}/lib/glad/ --spec gl --omit-khrplatform --local-files
 )
 add_custom_target(localglad
-	ALL
-	DEPENDS ${VENDOR_GLAD_SOURCES})
+        ALL
+        DEPENDS ${VENDOR_GLAD_SOURCES})
 
 
 #        lib/glad/glad.c
 #	lib/duktape/duktape.c lib/duktape/duktape.h lib/duktape/duk_config.h
 
 # ALL SOURCES
 set(SOURCE_FILES
-	${VENDOR_GLAD_SOURCES} ${VENDOR_DUKTAPE_SOURCES}
+        ${VENDOR_GLAD_SOURCES} ${VENDOR_DUKTAPE_SOURCES}
         src/engine/main.c
+
+        # Scripting
         src/engine/scripting/interface.c src/engine/scripting/interface.h
         src/engine/scripting/script.h
+
+        # Utilities
         src/engine/util/llist.c src/engine/util/llist.h
         src/engine/util/files.c src/engine/util/files.h
+        src/engine/util/dict.c src/engine/util/dict.h
+        src/engine/util/hashing/crc.c src/engine/util/hashing/crc.h
+
+        # Engine source
         src/engine/graphics/quadmesh.c src/engine/graphics/quadmesh.h
         src/engine/graphics/shader.c src/engine/graphics/shader.h
         src/engine/graphics/texture.c src/engine/graphics/texture.h lib/stb/stb_image.h
         src/engine/graphics/style.c src/engine/graphics/style.h
-        lib/linmath/linmath.h src/engine/scripting/callbacks.c src/engine/scripting/callbacks.h src/engine/graphics/screen.c src/engine/graphics/screen.h)
+        lib/linmath/linmath.h
+        src/engine/scripting/callbacks.c src/engine/scripting/callbacks.h
+        src/engine/graphics/screen.c src/engine/graphics/screen.h
+
+        # Vulkan
+        src/engine/graphics/vulkan/vulkan.c src/engine/graphics/vulkan/vulkan.h
+        src/engine/graphics/vulkan/wrappers.h
+        src/engine/graphics/vulkan/query.c src/engine/graphics/vulkan/query.h
+        src/engine/graphics/vulkan/debug.c src/engine/graphics/vulkan/debug.h
+        src/engine/graphics/vulkan/config.c src/engine/graphics/vulkan/config.h
+        src/engine/graphics/vulkan/queues.c src/engine/graphics/vulkan/queues.h
+        src/engine/graphics/vulkan/surface.c src/engine/graphics/vulkan/surface.h
+        src/engine/graphics/vulkan/window.c src/engine/graphics/vulkan/window.h
+        src/engine/graphics/vulkan/swapchain.c src/engine/graphics/vulkan/swapchain.h
+        src/engine/graphics/vulkan/shaders/shader.c src/engine/graphics/vulkan/shaders/shader.h
+        src/engine/graphics/vulkan/pipeline.c src/engine/graphics/vulkan/pipeline.h
+        src/engine/graphics/vulkan/framebuffer.c src/engine/graphics/vulkan/framebuffer.h
+        src/engine/graphics/vulkan/locking.c src/engine/graphics/vulkan/locking.h
+        src/engine/graphics/vulkan/memory/vbuffer.c src/engine/graphics/vulkan/memory/vbuffer.h
+        src/engine/graphics/vulkan/memory/memory.c src/engine/graphics/vulkan/memory/memory.h
+        src/engine/util/bits.h src/engine/graphics/vulkan/memory/buffer.h src/engine/graphics/vulkan/memory/buffer.c
+
+        src/engine/entity/entity.c src/engine/entity/entity.h
+        src/engine/entity/definitions/triangle.c src/engine/entity/definitions/triangle.h
+        src/engine/entity/manager.c src/engine/entity/manager.h
+        src/engine/graphics/vulkan/commands/pool.c src/engine/graphics/vulkan/commands/pool.h src/engine/graphics/vulkan/commands/buffer.c src/engine/graphics/vulkan/commands/buffer.h src/engine/graphics/vulkan/commands/render.c src/engine/graphics/vulkan/commands/render.h)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+
 
-set(CMAKE_INCLUDE_CURRENT_DIR  ON)
 
+# COPY SOURCE OF GAME INTO BUILD DIR
+add_custom_target(
+        game_client_code
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${CMAKE_SOURCE_DIR}/src/game/
+        ${CMAKE_CURRENT_BINARY_DIR}/)
 
 
 add_executable(engine ${SOURCE_FILES})
 
 # VENDOR DUKTAPE
-add_dependencies(engine localduktape localglad)
+add_dependencies(engine localduktape localglad localshaderc game_client_code)
 
 # GL, GLFW, DL, M
-target_link_libraries(engine dl m glfw GL)
+target_link_libraries(engine
+        dl m glfw GL vulkan
+        shaderc_combined stdc++ pthread)
 
 # STANDARDS
 set_property(TARGET engine PROPERTY C_STANDARD 99)
 enable_c_compiler_flag_if_supported("-Wall")
 enable_c_compiler_flag_if_supported("-Wextra")
 enable_c_compiler_flag_if_supported("-pedantic")
-
-# COPY SOURCE OF GAME INTO BUILD DIR
-add_custom_command(
-        TARGET engine POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_SOURCE_DIR}/src/game/
-        ${CMAKE_CURRENT_BINARY_DIR}/)

README.md

@@ -27,8 +27,8 @@ git pull --recursive-submodules
 | dl           | N/A              | Dynamically load libraries |
 | m            | N/A              | Standard math library      |
 | GLFW3        | libglfw3-dev     | GLFW 3 headers             |
-| GL           | GPU drivers, N/A | OpenGL headers and libs    |
 | Python 2     | python2          | Python 2 to build duktape  |
+| Ninja        | ninja-build      | Used by google's shaderc   |
 
 ## Used Libraries
 

src/engine/entity/definitions/triangle.c

@@ -0,0 +1,76 @@
+#include <lib/linmath/linmath.h>
+#include <src/engine/graphics/vulkan/memory/buffer.h>
+#include <src/engine/graphics/vulkan/window.h>
+#include <memory.h>
+#include <src/engine/graphics/vulkan/memory/vbuffer.h>
+#include <stdio.h>
+#include <src/engine/graphics/vulkan/commands/pool.h>
+#include <src/engine/graphics/vulkan/commands/buffer.h>
+#include "triangle.h"
+
+
+vec2 *triangle_center_position;
+buffer_t triangle_position_buffer, triangle_position_staging_buffer;
+
+void entity_triangle_update(entity_t *entity, void *metadata)
+{
+	(void) entity;
+	(void) metadata;
+
+	vec2 position = {
+			(cursor_x - (vulkan_window_width_get() / 2.0f)) / vulkan_window_width_get(),
+			(cursor_y - (vulkan_window_height_get() / 2.0f)) / vulkan_window_height_get()
+	};
+
+	/**
+	 * set triangle position
+	 */
+	memcpy(triangle_center_position, &position, sizeof(vec2));
+
+
+	uint32_t cbuffer_id = vulkan_commands_cpool_cbuffer_id_take(cpool);
+	vulkan_commands_buffer_begin(cpool, cbuffer_id);
+	{
+		vulkan_memory_buffer_copy(&triangle_position_staging_buffer, &triangle_position_buffer, vulkan_commands_cpool_cbuffer_get(cpool, cbuffer_id));
+	}
+	vulkan_commands_buffer_end(
+			cpool, cbuffer_id,
+			0, NULL, NULL,
+			0, NULL
+	);
+}
+
+void entity_triangle_free(entity_t *entity, void *metadata)
+{
+	(void) entity;
+	(void) metadata;
+}
+
+void entity_triangle_draw(entity_t *e, VkCommandBuffer buffer)
+{
+	(void) e;
+
+	VkBuffer vertexBuffers[] = {triangle_position_buffer.buffer};
+	VkDeviceSize offsets[] = {0};
+	vkCmdBindVertexBuffers(buffer, 0, 1, vertexBuffers, offsets);
+
+	vkCmdDraw(buffer, (uint32_t) triangle_position_buffer.num_elements, 1, 0, 0);
+}
+
+
+void entity_triangle_init(entity_t *entity, vulkan *v)
+{
+	// TODO: Do not allocate this here. This is game state logic
+	if (!vulkan_memory_vbuffer_allocate(v, &triangle_position_buffer, sizeof(vec2), 1, false)) {
+		printf("Failed allocate buffer\n");
+	}
+
+	if (!vulkan_memory_vbuffer_allocate(v, &triangle_position_staging_buffer, sizeof(vec2), 1, true)) {
+		printf("Failed allocate buffer\n");
+	}
+	triangle_center_position = triangle_position_staging_buffer.mapped_memory;
+
+	entity->update = (void (*)(struct entity_struct *)) entity_triangle_update;
+	entity->draw = (void (*)(struct entity_struct *, VkCommandBuffer)) (void (*)(struct entity_struct *)) entity_triangle_draw;
+	entity->free = (void (*)(struct entity_struct *)) entity_triangle_free;
+}

src/engine/entity/definitions/triangle.h

@@ -0,0 +1,17 @@
+#ifndef ENGINE_TRIANGLE_H
+#define ENGINE_TRIANGLE_H
+
+
+#include <src/engine/entity/entity.h>
+#include <vulkan/vulkan.h>
+#include <src/engine/graphics/vulkan/vulkan.h>
+
+void entity_triangle_init(entity_t *entity, vulkan *v);
+
+void entity_triangle_update(entity_t *entity, void *metadata);
+
+void entity_triangle_free(entity_t *entity, void *metadata);
+
+void entity_triangle_draw(entity_t *e, VkCommandBuffer buffer);
+
+#endif

src/engine/entity/entity.c

@@ -0,0 +1,47 @@
+#include "entity.h"
+
+void entity_init_empty(entity_t *e, void *metadata)
+{
+	(void) metadata;
+	if (!e) {
+		return;
+	}
+
+	e->allocated = false;
+
+	// Null out behavior
+	e->draw = NULL;
+	e->free = NULL;
+	e->update = NULL;
+
+	if (!e->paramaters) {
+		// This entity needs a dictionary allocated for them.
+		e->paramaters = dict_init(16);
+	} else {
+		// This entity already had a dict allocated. Just reuse this by emptying it
+		dict_clear(e->paramaters);
+	}
+}
+
+void entity_update(entity_t *entity, void *metadata)
+{
+	(void) metadata;
+	if (entity->update) {
+		entity->update(entity);
+	}
+}
+
+void entity_free(entity_t *entity, void *metadata)
+{
+	(void) metadata;
+	if (entity->free) {
+		entity->free(entity);
+	}
+}
+
+void entity_draw(entity_t *e, VkCommandBuffer metadata)
+{
+	if (e->draw) {
+		e->draw(e, metadata);
+	}
+}