projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48e87c0 6d5dafd)
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)
1  2 
src/glsl/nir/nir.h patch | diff1 | diff2 | blob | history
src/glsl/nir/spirv_to_nir.c patch | diff1 | diff2 | blob | history

diff --cc src/glsl/nir/nir.h
Simple merge
diff --cc src/glsl/nir/spirv_to_nir.c
Simple merge