Changed the OpenGL part and the GLSL shaders to use UBO and

[demo] / src / vulkan / shader-vk.cc

diff --git a/src/vulkan/shader-vk.cc b/src/vulkan/shader-vk.cc
index d53883d..1fa9fb3 100644 (file)
--- a/src/vulkan/shader-vk.cc
+++ b/src/vulkan/shader-vk.cc
@@ -39,7 +39,7 @@ bool ShaderVK::create(char *buf, unsigned int bsz, const char *fname)
        sminf.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
 
        sminf.codeSize = bsz;
-       sminf.pCode = (uint32_t*)buf;
+       sminf.pCode = (uint32_t *)buf;
 
        if(vkCreateShaderModule(vk_device, &sminf, 0, &sm) != VK_SUCCESS) {
                delete [] buf;
@@ -100,7 +100,7 @@ bool ShaderProgramVK::create()
                        fprintf(stderr, "Failed to create graphics pipeline: Invalid shader type.\n");
                        return false;
                }
-               ssinf[i].module = ((ShaderVK*)shaders[i])->sm;
+               ssinf[i].module = ((ShaderVK *)shaders[i])->sm;
        }
 
        gpinf.pStages = ssinf;
@@ -125,45 +125,3 @@ void ShaderProgramVK::destroy()
 void ShaderProgramVK::attach_shader(Shader *shader)
 {
 }
-
-int ShaderProgramVK::get_uniform_location(const char *name) const
-{
-       return 0;
-}
-
-void ShaderProgramVK::set_uniformi(int location, int value)
-{
-}
-
-void ShaderProgramVK::set_uniformi(int location, int x, int y)
-{
-}
-
-void ShaderProgramVK::set_uniformi(int location, int x, int y, int z)
-{
-}
-
-void ShaderProgramVK::set_uniformi(int location, int x, int y, int z, int w)
-{
-}
-
-
-void ShaderProgramVK::set_uniformf(int location, float value)
-{
-}
-
-void ShaderProgramVK::set_uniformf(int location, float x, float y)
-{
-}
-
-void ShaderProgramVK::set_uniformf(int location, float x, float y, float z)
-{
-}
-
-void ShaderProgramVK::set_uniformf(int location, float x, float y, float z, float w)
-{
-}
-
-void ShaderProgramVK::set_uniform_matrix(int location, const Mat4 &mat)
-{
-}