Бранимир Караџић 7 лет назад
Родитель
Сommit
d83c8439ff
1 измененных файлов с 15 добавлено и 19 удалено
  1. 15 19
      tools/shaderc/shaderc_spirv.cpp

+ 15 - 19
tools/shaderc/shaderc_spirv.cpp

@@ -796,15 +796,15 @@ namespace bgfx { namespace spirv
 				options.disableOptimizer = false;
 
 				glslang::GlslangToSpv(*intermediate, spirv, &options);
-				
+
 				spvtools::Optimizer opt(SPV_ENV_VULKAN_1_0);
-				
+
 				auto print_msg_to_stderr = [](spv_message_level_t, const char*,
 											  const spv_position_t&, const char* m) {
 					fprintf(stderr, "error:%s\n", m);
 				};
 				opt.SetMessageConsumer(print_msg_to_stderr);
-				
+
 				opt.RegisterLegalizationPasses();
 				if (!opt.Run(spirv.data(), spirv.size(), &spirv))
 				{
@@ -816,46 +816,42 @@ namespace bgfx { namespace spirv
 					bx::WriterI* writer = bx::getDebugOut();
 					bx::MemoryReader reader(spirv.data(), uint32_t(spirv.size()*4) );
 					disassemble(writer, &reader, &err);
-					
+
 					if (_version == BX_MAKEFOURCC('M', 'T', 'L', 0))
 					{
 						if (g_verbose)
 						{
 							glslang::SpirvToolsDisassemble(std::cout, spirv);
 						}
-						
+
 						spirv_cross::CompilerMSL msl(std::move(spirv));
-						
+
 						spirv_cross::ShaderResources resources = msl.get_shader_resources();
-						
-						int numThreads[3];
-						for (int i = 0; i < 3; ++i)
-							numThreads[i] = msl.get_execution_mode_argument(spv::ExecutionMode::ExecutionModeLocalSize, i);
-						
+
 						msl.rename_entry_point("main", "xlatMtlMain", spv::ExecutionModel::ExecutionModelGLCompute);
-						
+
 						for (auto &resource : resources.uniform_buffers)
 						{
 							msl.set_name(resource.id, "_mtl_u");
 						}
-						
+
 						for (auto &resource : resources.storage_buffers)
 						{
 							unsigned binding = msl.get_decoration(resource.id, spv::DecorationBinding);
 							msl.set_decoration(resource.id, spv::DecorationBinding, binding + 1);
-							
+
 							// workaround spirv -> msl codegen problem: same name was used as struct type and function parameter name
 							msl.set_name(resource.id, "_" + msl.get_name(resource.id));
 						}
-						
+
 						std::string source = msl.compile();
-						
+
 						for (int i = 0; i < 3; ++i)
 						{
 							uint16_t dim = (uint16_t)msl.get_execution_mode_argument(spv::ExecutionMode::ExecutionModeLocalSize, i);
 							bx::write(_writer, dim);
 						}
-						
+
 						uint32_t shaderSize = (uint32_t)source.size();
 						bx::write(_writer, shaderSize);
 						bx::write(_writer, source.c_str(), shaderSize);
@@ -873,7 +869,7 @@ namespace bgfx { namespace spirv
 					//
 					const uint8_t numAttr = (uint8_t)program->getNumLiveAttributes();
 					bx::write(_writer, numAttr);
-					
+
 					for (uint8_t ii = 0; ii < numAttr; ++ii)
 					{
 						bgfx::Attrib::Enum attr = toAttribEnum(program->getAttributeName(ii) );
@@ -886,7 +882,7 @@ namespace bgfx { namespace spirv
 							bx::write(_writer, uint16_t(UINT16_MAX) );
 						}
 					}
-					
+
 					bx::write(_writer, size);
 				}
 			}