projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15895bf 1cd19eb)
Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Thu, 7 Apr 2016 23:56:34 +0000 (16:56 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Thu, 7 Apr 2016 23:56:34 +0000 (16:56 -0700)
1  2 
src/mesa/drivers/dri/i965/brw_fs.cpp patch | diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_fs_nir.cpp patch | diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp patch | diff1 | diff2 | blob | history
src/mesa/main/mtypes.h patch | diff1 | diff2 | blob | history

diff --cc src/mesa/drivers/dri/i965/brw_fs.cpp
Simple merge
diff --cc src/mesa/main/mtypes.h
Simple merge