AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes after github review.

Browse Source 
Remap with binding instead of name.
This commit is contained in:
Amer Koleci 2017-11-10 20:08:55 +01:00 committed by Hans-Kristian Arntzen
parent 7216d13620
commit 7cf44099c9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spirv_hlsl.cpp
View File

@ -674,7 +674,7 @@ void CompilerHLSL::emit_interface_block_in_struct(const SPIRVariable &var, unord
{ {
for (auto &attribute : vertex_attributes) for (auto &attribute : vertex_attributes)
{ {
if (attribute.name == name) if (attribute.binding == binding_number)
{ {
semantic = attribute.semantic; semantic = attribute.semantic;
semantic_index = attribute.semantic_index; semantic_index = attribute.semantic_index;
@ -3165,9 +3165,7 @@ string CompilerHLSL::compile(std::vector<HLSLVertexAttr> *p_vertex_attributes)
{ {
if (p_vertex_attributes) if (p_vertex_attributes)
{ {
vertex_attributes.clear(); vertex_attributes = *p_vertex_attributes;
for (auto &va : *p_vertex_attributes)
vertex_attributes.emplace_back(va);
} }
return compile(); return compile();

2
spirv_hlsl.hpp
View File

@ -25,7 +25,7 @@ namespace spirv_cross
{ {
struct HLSLVertexAttr struct HLSLVertexAttr
{ {
std::string name; uint32_t binding;
std::string semantic; std::string semantic;
uint32_t semantic_index; uint32_t semantic_index;
}; };