Vulkan for RmlUi

CMake/SampleFileList.cmake

@@ -8,15 +8,21 @@ set(shell_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Samples/shell/include/ShellOpenGL.h
     ${PROJECT_SOURCE_DIR}/Samples/shell/include/ShellRenderInterfaceExtensions.h
     ${PROJECT_SOURCE_DIR}/Samples/shell/include/ShellRenderInterfaceOpenGL.h
+    ${PROJECT_SOURCE_DIR}/Samples/shell/include/ShellRenderInterfaceVulkan.h
     ${PROJECT_SOURCE_DIR}/Samples/shell/include/ShellSystemInterface.h
+    ${PROJECT_SOURCE_DIR}/Samples/shell/include/spirv.h
+    ${PROJECT_SOURCE_DIR}/Samples/shell/include/spirv_reflect.h
+    ${PROJECT_SOURCE_DIR}/Samples/shell/include/vk_mem_alloc.h
 )
 
 set(shell_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/shell/src/Input.cpp
     ${PROJECT_SOURCE_DIR}/Samples/shell/src/Shell.cpp
     ${PROJECT_SOURCE_DIR}/Samples/shell/src/ShellFileInterface.cpp
     ${PROJECT_SOURCE_DIR}/Samples/shell/src/ShellRenderInterfaceOpenGL.cpp
+    ${PROJECT_SOURCE_DIR}/Samples/shell/src/ShellRenderInterfaceVulkan.cpp
     ${PROJECT_SOURCE_DIR}/Samples/shell/src/ShellSystemInterface.cpp
+    ${PROJECT_SOURCE_DIR}/Samples/shell/src/spirv_reflect.cpp
 )
 
 set(animation_HDR_FILES

CMakeLists.txt

@@ -626,11 +626,22 @@ if(BUILD_SAMPLES OR BUILD_TESTING)
 
 	# Find OpenGL 
 	find_package(OpenGL REQUIRED)
+
+	find_package(Vulkan REQUIRED)
 
 	if(OPENGL_FOUND)
+		message("-- OpenGL is found! ${OPENGL_INCLUDE_DIR}")
+		message("-- OpenGL is found! ${OPENGL_LIBRARIES}")
 		include_directories(${OPENGL_INCLUDE_DIR})
 		list(APPEND sample_LIBRARIES ${OPENGL_LIBRARIES})
 	endif()
+
+	if (Vulkan_FOUND)
+		message("-- Vulkan is found! ${Vulkan_INCLUDE_DIR}")
+		message("-- Vulkan is found! ${Vulkan_LIBRARIES}")
+		include_directories(${Vulkan_INCLUDE_DIR})
+		list(APPEND sample_LIBRARIES ${Vulkan_LIBRARIES})
+	endif()
 
 	# Set up required system libraries
 	if(APPLE)

Samples/assets/rmlui.frag

@@ -0,0 +1,14 @@
+#version 400
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (location = 0) in vec2 inTexCoord;
+layout (location = 1) in vec4 inColor;
+
+layout (location = 0) out vec4 outColor;
+
+layout(set=0, binding=1) uniform sampler2D Texture;
+
+void main() {
+   outColor = inColor;
+}

Samples/assets/rmlui.vert

@@ -0,0 +1,16 @@
+#version 400
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (location = 0) in vec2 pos;
+layout (location = 1) in vec4 inColor;
+layout (location = 2) in vec2 inTexCoord;
+
+layout (location = 0) out vec2 outTexCoord;
+layout (location = 1) out vec4 outColor;
+
+void main() {
+   outColor = inColor;
+   outTexCoord = inTexCoord;
+   gl_Position = vec4(pos, 0.0f, 1.0f);
+} 

Samples/assets/shader_pixel_with_textures.frag

@@ -0,0 +1,15 @@
+#version 330
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout(set=1, binding=2) uniform sampler2D _tex;
+layout (location = 0) in vec2 fragTexCoord;
+layout (location = 1) in vec4 fragColor;
+
+layout (location = 0) out vec4 finalColor;
+
+void main() {
+	vec4 texColor = texture(_tex, fragTexCoord);
+	finalColor = fragColor * texColor;
+}

Samples/assets/shader_pixel_without_textures.frag

@@ -0,0 +1,12 @@
+#version 330
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (location = 0) in vec2 fragTexCoord;
+layout (location = 1) in vec4 fragColor;
+layout (location = 0) out vec4 finalColor;
+
+void main() {
+	finalColor = fragColor;
+}

Samples/assets/shader_vertex.vert

@@ -0,0 +1,25 @@
+#version 330
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout(set=0, binding=1) uniform UserData 
+{
+	mat4 m_transform;
+	vec2 m_translate;
+} userdata;
+
+layout (location = 0) in vec2 inPosition;
+layout (location = 1) in vec4 inColor0;
+layout (location = 2) in vec2 inTexCoord0;
+
+layout (location = 0) out vec2 fragTexCoord;
+layout (location = 1) out vec4 fragColor;
+
+void main() {
+	fragTexCoord = inTexCoord0;
+	fragColor = inColor0;
+	vec2 translatedPos = inPosition + userdata.m_translate.xy;
+	vec4 outPos = userdata.m_transform * vec4(translatedPos, 0, 1);
+    gl_Position = outPos;
+}

Samples/basic/loaddocument/src/main.cpp

@@ -31,6 +31,7 @@
 #include <Input.h>
 #include <Shell.h>
 #include <ShellRenderInterfaceOpenGL.h>
+#include <ShellRenderInterfaceVulkan.h>
 
 Rml::Context* context = nullptr;
 
@@ -70,7 +71,10 @@ int main(int RMLUI_UNUSED_PARAMETER(argc), char** RMLUI_UNUSED_PARAMETER(argv))
     int window_height = 768;
 
 	ShellRenderInterfaceOpenGL opengl_renderer;
-	shell_renderer = &opengl_renderer;
+	ShellRenderInterfaceVulkan vulkan_renderer;
+
+	shell_renderer = &vulkan_renderer;
+//	shell_renderer = &opengl_renderer;
 
 	// Generic OS initialisation, creates a window and attaches OpenGL.
 	if (!Shell::Initialise() ||
@@ -81,7 +85,8 @@ int main(int RMLUI_UNUSED_PARAMETER(argc), char** RMLUI_UNUSED_PARAMETER(argv))
 	}
 
 	// RmlUi initialisation.
-	Rml::SetRenderInterface(&opengl_renderer);
+	Rml::SetRenderInterface(&vulkan_renderer);
+//	Rml::SetRenderInterface(&opengl_renderer);
 	shell_renderer->SetViewport(window_width, window_height);
 
 	ShellSystemInterface system_interface;

Samples/basic/treeview/src/main.cpp

@@ -31,6 +31,7 @@
 #include <Input.h>
 #include <Shell.h>
 #include <ShellRenderInterfaceOpenGL.h>
+#include <ShellRenderInterfaceVulkan.h>
 #include "FileBrowser.h"
 
 Rml::Context* context = nullptr;
@@ -71,7 +72,10 @@ int main(int RMLUI_UNUSED_PARAMETER(argc), char** RMLUI_UNUSED_PARAMETER(argv))
 	int window_height = 768;
 
 	ShellRenderInterfaceOpenGL opengl_renderer;
-	shell_renderer = &opengl_renderer;
+	ShellRenderInterfaceVulkan vulkan_renderer;
+	Rml::RenderInterface* p_renderer = &vulkan_renderer;
+	//shell_renderer = &opengl_renderer;
+	shell_renderer = &vulkan_renderer;
 
 	// Generic OS initialisation, creates a window and attaches OpenGL.
 	if (!Shell::Initialise() ||
@@ -82,8 +86,11 @@ int main(int RMLUI_UNUSED_PARAMETER(argc), char** RMLUI_UNUSED_PARAMETER(argv))
 	}
 
 	// RmlUi initialisation.
-	Rml::SetRenderInterface(&opengl_renderer);
+//	Rml::SetRenderInterface(&opengl_renderer);
+
+	Rml::SetRenderInterface(p_renderer);
 	opengl_renderer.SetViewport(window_width, window_height);
+	vulkan_renderer.SetViewport(window_width, window_height);
 
 	ShellSystemInterface system_interface;
 	Rml::SetSystemInterface(&system_interface);

Samples/invaders/src/main.cpp

@@ -30,6 +30,7 @@
 #include <RmlUi/Debugger.h>
 #include <Shell.h>
 #include <ShellRenderInterfaceOpenGL.h>
+#include <ShellRenderInterfaceVulkan.h>
 #include <Input.h>
 #include "DecoratorInstancerDefender.h"
 #include "DecoratorInstancerStarfield.h"
@@ -78,9 +79,10 @@ int main(int RMLUI_UNUSED_PARAMETER(argc), char** RMLUI_UNUSED_PARAMETER(argv))
 	int window_width = 1024;
 	int window_height = 768;
 
-	ShellRenderInterfaceOpenGL opengl_renderer;
-	shell_renderer = &opengl_renderer;
-
+	//ShellRenderInterfaceOpenGL opengl_renderer;
+	ShellRenderInterfaceVulkan vulkan_renderer;
+	//shell_renderer = &opengl_renderer;
+	shell_renderer = &vulkan_renderer;
 	// Generic OS initialisation, creates a window and attaches OpenGL.
 	if (!Shell::Initialise() ||
 		!Shell::OpenWindow("RmlUi Invaders from Mars", shell_renderer, window_width, window_height, false))
@@ -90,8 +92,9 @@ int main(int RMLUI_UNUSED_PARAMETER(argc), char** RMLUI_UNUSED_PARAMETER(argv))
 	}
 
 	// RmlUi initialisation.
-	Rml::SetRenderInterface(&opengl_renderer);
-	opengl_renderer.SetViewport(window_width, window_height);
+	//Rml::SetRenderInterface(&opengl_renderer);
+	Rml::SetRenderInterface(&vulkan_renderer);
+	shell_renderer->SetViewport(window_width, window_height);
 
 	ShellSystemInterface system_interface;
 	Rml::SetSystemInterface(&system_interface);

Samples/shell/include/ShellOpenGL.h

@@ -33,8 +33,13 @@
 
 #if defined RMLUI_PLATFORM_WIN32
 #include "win32/IncludeWindows.h"
+
+#define VK_USE_PLATFORM_WIN32_KHR
+#include <vulkan/vulkan.h>
+
 #include <gl/Gl.h>
 #include <gl/Glu.h>
+
 #elif defined RMLUI_PLATFORM_MACOSX
 #include <AGL/agl.h>
 #include <OpenGL/gl.h>