projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fe786ff) | patch
nir/spirv.h: Remove some cruft missed while merging
authorJason Ekstrand <jason.ekstrand@intel.com>
Sat, 5 Sep 2015 21:11:40 +0000 (14:11 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 5 Sep 2015 21:11:40 +0000 (14:11 -0700)
commit4d73ca3c582cf6fa8f9d36f5d752eb44efe71982
tree77c9590ef492636cd72bbb67cb0edf54bfc2742atree
parentfe786ff67de95cf81b2ac52fe3bcf605a372b084commit | diff
nir/spirv.h: Remove some cruft missed while merging

There were merge conflicts in spirv.h that got missed because they were in
a comment and so it still compiled.  This gets rid of them and we should be
on-par with upstream spirv->nir.
src/glsl/nir/spirv.h diff | blob | history