From 5b43b31529447482add3a441596910db16e0ce4c Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Sun, 3 Apr 2016 20:36:28 -1000
Subject: [PATCH] Vulkan API sync

---
 include/boo/graphicsdev/Vulkan.hpp | 2 +-
 lib/graphicsdev/GL.cpp             | 2 +-
 lib/graphicsdev/Vulkan.cpp         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/boo/graphicsdev/Vulkan.hpp b/include/boo/graphicsdev/Vulkan.hpp
index 1af7386..fb3faa1 100644
--- a/include/boo/graphicsdev/Vulkan.hpp
+++ b/include/boo/graphicsdev/Vulkan.hpp
@@ -131,7 +131,7 @@ public:
         newShaderDataBinding(IShaderPipeline* pipeline,
                              IVertexFormat* vtxFormat,
                              IGraphicsBuffer* vbo, IGraphicsBuffer* instVbo, IGraphicsBuffer* ibo,
-                             size_t ubufCount, IGraphicsBuffer** ubufs,
+                             size_t ubufCount, IGraphicsBuffer** ubufs, const PipelineStage* ubufStages,
                              const size_t* ubufOffs, const size_t* ubufSizes,
                              size_t texCount, ITexture** texs);
     };
diff --git a/lib/graphicsdev/GL.cpp b/lib/graphicsdev/GL.cpp
index 292bca0..0d9e6a4 100644
--- a/lib/graphicsdev/GL.cpp
+++ b/lib/graphicsdev/GL.cpp
@@ -506,7 +506,7 @@ IShaderPipeline* GLDataFactory::Context::newShaderPipeline
         {
             GLint uniLoc = glGetUniformBlockIndex(shader.m_prog, uniformBlockNames[i]);
             if (uniLoc < 0)
-                Log.report(logvisor::Error, "unable to find uniform block '%s'", uniformBlockNames[i]);
+                Log.report(logvisor::Warning, "unable to find uniform block '%s'", uniformBlockNames[i]);
             shader.m_uniLocs.push_back(uniLoc);
         }
     }
diff --git a/lib/graphicsdev/Vulkan.cpp b/lib/graphicsdev/Vulkan.cpp
index 65b3b3f..010dd27 100644
--- a/lib/graphicsdev/Vulkan.cpp
+++ b/lib/graphicsdev/Vulkan.cpp
@@ -3072,7 +3072,7 @@ IVertexFormat* VulkanDataFactory::Context::newVertexFormat(size_t elementCount,
 IShaderDataBinding* VulkanDataFactory::Context::newShaderDataBinding(IShaderPipeline* pipeline,
         IVertexFormat* /*vtxFormat*/,
         IGraphicsBuffer* vbuf, IGraphicsBuffer* instVbuf, IGraphicsBuffer* ibuf,
-        size_t ubufCount, IGraphicsBuffer** ubufs,
+        size_t ubufCount, IGraphicsBuffer** ubufs, const PipelineStage* /*ubufStages*/,
         const size_t* ubufOffs, const size_t* ubufSizes,
         size_t texCount, ITexture** texs)
 {