Merge remote-tracking branch 'fdo-personal/wip/nir-vtn' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Sat, 16 May 2015 19:43:16 +0000 (12:43 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 16 May 2015 19:43:16 +0000 (12:43 -0700)
This adds the SPIR-V -> NIR translator.

1  2 
src/glsl/ast_to_hir.cpp
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp

Simple merge
Simple merge