Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 2 Oct 2015 23:45:48 +0000 (16:45 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 2 Oct 2015 23:52:47 +0000 (16:52 -0700)
commitef56cf7738ecb25e8c668c509097fc714ca71c96
tree94417116a6147dbf1065089d9a45fd76f9642e6c
parent10f97718c353e101c64fa60fcde91e1550e39957
parentbf7b6fd3fd6d98305d64ee6224ca9f9e7ba48444
Merge remote-tracking branch 'mesa-public/master' into vulkan
20 files changed:
src/glsl/ast_to_hir.cpp
src/glsl/glsl_types.cpp
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/nir.h
src/glsl/nir/nir_intrinsics.h
src/mesa/drivers/dri/i965/brw_context.h
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_gs.c
src/mesa/drivers/dri/i965/brw_nir.c
src/mesa/drivers/dri/i965/brw_nir.h
src/mesa/drivers/dri/i965/brw_program.c
src/mesa/drivers/dri/i965/brw_shader.cpp
src/mesa/drivers/dri/i965/brw_vec4.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
src/mesa/drivers/dri/i965/brw_wm.c
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/program/ir_to_mesa.cpp
src/vulkan/anv_compiler.cpp