Merge remote-tracking branch 'fdo-personal/nir-spirv' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 1 Sep 2015 00:14:47 +0000 (17:14 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Tue, 1 Sep 2015 00:14:47 +0000 (17:14 -0700)
commit6350c97412d993de1ae876312bab9689a7f34839
tree1d8518f6d15854e4acc60fb74b332115a506e2f8
parent0af4bf4d4bc96d1a8471bdfe8055fa05e7ccd0fe
parent22fdb2f8551330fea308ce9cfe151ec00201e2b1
Merge remote-tracking branch 'fdo-personal/nir-spirv' into vulkan

From now on, the majority of SPIR-V improvements should happen on the spirv
branch which will also be public.  It will be frequently merged into the
vulkan driver.
src/glsl/nir/nir.h
src/glsl/nir/spirv.h