Merge branch 'nir-spirv' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Sat, 5 Sep 2015 01:54:15 +0000 (18:54 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 5 Sep 2015 01:54:15 +0000 (18:54 -0700)
commit9a95d08ed6af92c38f84d750022131c9d03f77ce
treef678efec26402b0c2da6e3328f13dc037329e370
parent48e87c01630b8559e4e5ee669b77b8b1d10fd623
parent6d5dafd779550391c2313e82e6630d7a93cf9530
Merge branch 'nir-spirv' into vulkan
src/glsl/nir/nir.h
src/glsl/nir/spirv_to_nir.c