ソースを参照

More fixes in order to get Vulkan running on unified shading platform

BearishSun 8 年 前
コミット
1343aec226

+ 3 - 5
Source/BansheeSL/Source/BsSLFXCompiler.cpp

@@ -267,17 +267,15 @@ namespace bs
 			return "";
 		}
 
-		INT32 maxBindingSlot = 0;
 		for (auto& entry : reflectionData.constantBuffers)
-			maxBindingSlot = std::max(maxBindingSlot, entry.location);
+			startBindingSlot = std::max(startBindingSlot, entry.location + 1u);
 
 		for (auto& entry : reflectionData.textures)
-			maxBindingSlot = std::max(maxBindingSlot, entry.location);
+			startBindingSlot = std::max(startBindingSlot, entry.location + 1u);
 
 		for (auto& entry : reflectionData.storageBuffers)
-			maxBindingSlot = std::max(maxBindingSlot, entry.location);
+			startBindingSlot = std::max(startBindingSlot, entry.location + 1u);
 
-		startBindingSlot = maxBindingSlot;
 		return output.str();
 	}
 

+ 1 - 1
Source/CMakeLists.txt

@@ -6,7 +6,7 @@ set (BS_VERSION_MAJOR 0)
 set (BS_VERSION_MINOR 4)
 
 set (BS_PREBUILT_DEPENDENCIES_VERSION 1)
-set (BS_SRC_DEPENDENCIES_VERSION 6)
+set (BS_SRC_DEPENDENCIES_VERSION 8)
 
 # Configuration types
 if(CMAKE_CONFIGURATION_TYPES) # Multiconfig generator?

+ 1 - 1
Source/External/XShaderCompiler

@@ -1 +1 @@
-Subproject commit 204c358af4d4185cef729022681259602711d1ef
+Subproject commit 0da09d8257c440e89593b5dc4aaae675990198cb