diff --git a/include/boo/graphicsdev/GL.hpp b/include/boo/graphicsdev/GL.hpp
index 42e5582..9bb6faa 100644
--- a/include/boo/graphicsdev/GL.hpp
+++ b/include/boo/graphicsdev/GL.hpp
@@ -63,7 +63,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/include/boo/graphicsdev/IGraphicsDataFactory.hpp b/include/boo/graphicsdev/IGraphicsDataFactory.hpp
index 32fa28a..33ec7b1 100644
--- a/include/boo/graphicsdev/IGraphicsDataFactory.hpp
+++ b/include/boo/graphicsdev/IGraphicsDataFactory.hpp
@@ -152,6 +152,13 @@ struct IShaderDataBinding {};
 struct IGraphicsData {};
 class GraphicsDataToken;
 
+/** Used wherever distinction of pipeline stages is needed */
+enum class PipelineStage
+{
+    Vertex,
+    Fragment
+};
+
 /** Used by platform shader pipeline constructors */
 enum class Primitive
 {
@@ -225,7 +232,7 @@ struct IGraphicsDataFactory
         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)=0;
 
@@ -233,11 +240,11 @@ struct IGraphicsDataFactory
         newShaderDataBinding(IShaderPipeline* pipeline,
                              IVertexFormat* vtxFormat,
                              IGraphicsBuffer* vbo, IGraphicsBuffer* instVbo, IGraphicsBuffer* ibo,
-                             size_t ubufCount, IGraphicsBuffer** ubufs,
+                             size_t ubufCount, IGraphicsBuffer** ubufs, const PipelineStage* ubufStages,
                              size_t texCount, ITexture** texs)
         {
             return newShaderDataBinding(pipeline, vtxFormat, vbo, instVbo, ibo,
-                                        ubufCount, ubufs, nullptr, nullptr, texCount, texs);
+                                        ubufCount, ubufs, ubufStages, nullptr, nullptr, texCount, texs);
         }
     };
 
diff --git a/include/boo/graphicsdev/Metal.hpp b/include/boo/graphicsdev/Metal.hpp
index 8ba6543..60a6fb0 100644
--- a/include/boo/graphicsdev/Metal.hpp
+++ b/include/boo/graphicsdev/Metal.hpp
@@ -70,7 +70,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 d9840c9..292bca0 100644
--- a/lib/graphicsdev/GL.cpp
+++ b/lib/graphicsdev/GL.cpp
@@ -655,7 +655,7 @@ IShaderDataBinding*
 GLDataFactory::Context::newShaderDataBinding(IShaderPipeline* pipeline,
                                              IVertexFormat* vtxFormat,
                                              IGraphicsBuffer*, IGraphicsBuffer*, IGraphicsBuffer*,
-                                             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/Metal.mm b/lib/graphicsdev/Metal.mm
index 45cf3e2..f9ac89c 100644
--- a/lib/graphicsdev/Metal.mm
+++ b/lib/graphicsdev/Metal.mm
@@ -573,13 +573,13 @@ struct MetalShaderDataBinding : IShaderDataBinding
     IGraphicsBuffer* m_ibuf;
     size_t m_ubufCount;
     std::unique_ptr<IGraphicsBuffer*[]> m_ubufs;
-    std::vector<size_t> m_ubufOffs;
+    std::vector<std::pair<size_t, bool>> m_ubufOffs;
     size_t m_texCount;
     std::unique_ptr<ITexture*[]> m_texs;
     MetalShaderDataBinding(MetalContext* ctx,
                            IShaderPipeline* pipeline,
                            IGraphicsBuffer* vbuf, IGraphicsBuffer* instVbo, 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)
     : m_pipeline(static_cast<MetalShaderPipeline*>(pipeline)),
@@ -600,7 +600,7 @@ struct MetalShaderDataBinding : IShaderDataBinding
                 if (ubufOffs[i] % 256)
                     Log.report(logvisor::Fatal, "non-256-byte-aligned uniform-offset %d provided to newShaderDataBinding", int(i));
 #endif
-                m_ubufOffs.push_back(ubufOffs[i]);
+                m_ubufOffs.push_back({ubufOffs[i], ubufStages && ubufStages[i] == PipelineStage::Fragment});
             }
         }
         for (size_t i=0 ; i<ubufCount ; ++i)
@@ -630,7 +630,10 @@ struct MetalShaderDataBinding : IShaderDataBinding
             [enc setVertexBuffer:GetBufferGPUResource(m_instVbo, b) offset:0 atIndex:1];
         if (m_ubufOffs.size())
             for (size_t i=0 ; i<m_ubufCount ; ++i)
-                [enc setVertexBuffer:GetBufferGPUResource(m_ubufs[i], b) offset:m_ubufOffs[i] atIndex:i+2];
+                if (m_ubufOffs[i].second)
+                    [enc setFragmentBuffer:GetBufferGPUResource(m_ubufs[i], b) offset:m_ubufOffs[i].first atIndex:i+2];
+                else
+                    [enc setVertexBuffer:GetBufferGPUResource(m_ubufs[i], b) offset:m_ubufOffs[i].first atIndex:i+2];
         else
             for (size_t i=0 ; i<m_ubufCount ; ++i)
                 [enc setVertexBuffer:GetBufferGPUResource(m_ubufs[i], b) offset:0 atIndex:i+2];
@@ -1056,13 +1059,13 @@ IShaderDataBinding*
 MetalDataFactory::Context::newShaderDataBinding(IShaderPipeline* pipeline,
                                                 IVertexFormat* vtxFormat,
                                                 IGraphicsBuffer* vbuf, IGraphicsBuffer* instVbo, 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)
 {
     MetalShaderDataBinding* retval =
     new MetalShaderDataBinding(m_parent.m_ctx, pipeline, vbuf, instVbo, ibuf,
-                               ubufCount, ubufs, ubufOffs, ubufSizes, texCount, texs);
+                               ubufCount, ubufs, ubufStages, ubufOffs, ubufSizes, texCount, texs);
     m_deferredData->m_SBinds.emplace_back(retval);
     return retval;
 }
diff --git a/test/main.cpp b/test/main.cpp
index e2fe60c..e97696f 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -375,7 +375,7 @@ struct TestApplicationCallback : IApplicationCallback
 
             /* Make shader data binding */
             self->m_binding =
-            ctx.newShaderDataBinding(pipeline, vfmt, vbo, nullptr, nullptr, 0, nullptr, 1, &texture);
+            ctx.newShaderDataBinding(pipeline, vfmt, vbo, nullptr, nullptr, 0, nullptr, nullptr, 1, &texture);
 
             return true;
         });