Merge branch 'nir-spirv' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Sat, 5 Sep 2015 16:48:15 +0000 (09:48 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 5 Sep 2015 16:48:33 +0000 (09:48 -0700)
1  2 
src/glsl/nir/spirv_to_nir.c

Simple merge