Manually merge ClemensRognerSD-dx9-sampler and resolve conflicts.
This commit is contained in:
parent
5d43c4aac7
commit
bd1c1831d5
13 changed files with 1060 additions and 8 deletions
|
|
@ -84,6 +84,7 @@ namespace glslang {
|
|||
bool acceptStreamOutTemplateType(TType&, TLayoutGeometry&);
|
||||
bool acceptOutputPrimitiveGeometry(TLayoutGeometry&);
|
||||
bool acceptAnnotations(TQualifier&);
|
||||
bool acceptSamplerTypeDX9(TType &);
|
||||
bool acceptSamplerType(TType&);
|
||||
bool acceptTextureType(TType&);
|
||||
bool acceptSubpassInputType(TType&);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue