anv: Fix rebase error
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Sat, 5 Mar 2016 22:33:50 +0000 (14:33 -0800)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Sat, 5 Mar 2016 22:33:50 +0000 (14:33 -0800)
commit7b348ab8a0d38b504f659a0b4b6c8aca1a52ea6b
treeabb687c7f13436f4f09cdc328d75e35d4e3b8ed2
parent34326f46dfe1511529363b4ab46477f04d3e1574
anv: Fix rebase error
src/intel/vulkan/gen8_pipeline.c