X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fgfxapi.cc;h=f50a3175ee1157ee6af17b6cbd24d18875b73c1b;hb=0f6519c2606f2863d9c7ee8b9754b9f23df281ab;hp=58692a3e5f7f86e6b9350b76b848331946295f97;hpb=697231b0832d626b328fc9ae4a5a5ef9a003aa1a;p=demo

diff --git a/src/gfxapi.cc b/src/gfxapi.cc
index 58692a3..f50a317 100644
--- a/src/gfxapi.cc
+++ b/src/gfxapi.cc
@@ -6,15 +6,24 @@
 #include "opengl/mesh-gl.h"
 #include "opengl/texture-gl.h"
 #include "opengl/shader-gl.h"
+#include "opengl/uniforms-gl.h"
 
+#include "vulkan/shader-vk.h"
 #include "vulkan/mesh-vk.h"
 #include "vulkan/texture-vk.h"
+#include "vulkan/uniforms-vk.h"
 
 static Gfx_API api;
 
 void (*gfx_clear)(float r, float g, float b);
 void (*gfx_viewport)(int x, int y, int width, int height);
-
+void (*gfx_zbuffer)(bool enable);
+void (*gfx_cull_face)(Gfx_cull_face cf);
+void (*gfx_reshape)(int width, int height);
+void (*gfx_wireframe)(bool enable);
+void (*gfx_swapbuffers)();
+void (*gfx_begin_drawing)();
+void (*gfx_end_drawing)();
 
 bool gfx_init(Gfx_API api)
 {
@@ -74,8 +83,7 @@ ShaderProgram *gfx_create_shader_program()
 	case GFX_GL:
 		return new ShaderProgramGL;
 	case GFX_VK:
-		// return new ShaderProgramVK;
-		return 0;
+		return new ShaderProgramVK;
 	}
 	return 0;
 }
@@ -86,8 +94,18 @@ Shader *gfx_create_shader()
 	case GFX_GL:
 		return new ShaderGL;
 	case GFX_VK:
-		// return new ShaderVK;
-		return 0;
+		return new ShaderVK;
+	}
+	return 0;
+}
+
+UniformBuffer *gfx_create_uniform_buffer()
+{
+	switch(api) {
+	case GFX_GL:
+		return new UniformBufferGL;
+	case GFX_VK:
+		return new UniformBufferVK;
 	}
 	return 0;
 }
@@ -96,9 +114,9 @@ char *gfx_get_shader_path()
 {
 	switch(api) {
 	case GFX_GL:
-		return (char *)"gl_shaders";
+		return (char *)"shaders";
 	case GFX_VK:
-		return (char *)"vk_shaders";
+		return (char *)"shaders/spirv";
 	}
-	return (char*)"";
-}
\ No newline at end of file
+	return (char *)"";
+}