i965: remove includes of sampler.h from extern "C" blocks
authorMark Janes <mark.a.janes@intel.com>
Tue, 16 Dec 2014 22:29:28 +0000 (14:29 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Tue, 16 Dec 2014 23:39:55 +0000 (15:39 -0800)
commitfc016bc0f3d83bbf3eb968938f4bc9df55214ecd
tree92655c46ff9c6a66743a962726b1fb3808c1073f
parent3eb6258db7b7590493e473bf654409212061b8b0
i965: remove includes of sampler.h from extern "C" blocks

C linkage was removed from functions in program/sampler.cpp.  However,
some cpp files include program/sampler.h within extern "C" blocks,
causing link errors for test_vec4_copy_propagation.

Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs.h
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp