Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Thu, 14 Jan 2016 19:36:17 +0000 (11:36 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Thu, 14 Jan 2016 19:36:27 +0000 (11:36 -0800)
commit45349acad01f4a27386f676e481c4eeddf64cdc0
treedc4c933cd6a523c425f4a62f86dcdec82c53c8f0
parentf46f4e488641437556188a3182ce4ddabd6f42d0
parente94ef885bb71b46aba4517523ebb63c0d4b36c4b
Merge remote-tracking branch 'mesa-public/master' into vulkan

This fixes the bitfieldextract and bitfieldinsert CTS tests
13 files changed:
src/glsl/Makefile.am
src/glsl/ast_to_hir.cpp
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/nir.h
src/glsl/nir/nir_opcodes.py
src/glsl/nir/nir_opt_algebraic.py
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_shader.cpp
src/mesa/drivers/dri/i965/brw_surface_formats.c
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/program/ir_to_mesa.cpp