diff --git a/tools/shaderc/shaderc_metal.cpp b/tools/shaderc/shaderc_metal.cpp
index 516b2d1d6d..0404704f29 100644
--- a/tools/shaderc/shaderc_metal.cpp
+++ b/tools/shaderc/shaderc_metal.cpp
@@ -539,7 +539,8 @@ namespace bgfx { namespace metal
 						Uniform un;
 						un.name = program->getUniformName(ii);
 
-						if (bx::hasSuffix(un.name.c_str(), ".@data") )
+						if (bx::hasSuffix(un.name.c_str(), ".@data")
+						||  !bx::strFind(un.name.c_str(), ".@data.").isEmpty() )
 						{
 							continue;
 						}
diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp
index 7678cec39a..fa2866d5f6 100644
--- a/tools/shaderc/shaderc_spirv.cpp
+++ b/tools/shaderc/shaderc_spirv.cpp
@@ -664,7 +664,8 @@ namespace bgfx { namespace spirv
 						Uniform un;
 						un.name = program->getUniformName(ii);
 
-						if (bx::hasSuffix(un.name.c_str(), ".@data") )
+						if (bx::hasSuffix(un.name.c_str(), ".@data")
+						||  !bx::strFind(un.name.c_str(), ".@data.").isEmpty() )
 						{
 							continue;
 						}