Merge pull request #874 from xlpiao/DescriptorSet-and-Binding
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Wed, 10 May 2017 17:10:53 +0000 (11:10 -0600)
committerGitHub <noreply@github.com>
Wed, 10 May 2017 17:10:53 +0000 (11:10 -0600)
HLSL: Manually configure descriptor set and binding number for resources

1  2 
glslang/MachineIndependent/iomapper.cpp
glslang/MachineIndependent/localintermediate.h
gtests/Hlsl.FromFile.cpp
hlsl/hlslParseHelper.cpp

Simple merge
Simple merge