Merge branch 'glsl2-head' into glsl2
[mesa.git] / src / mesa / drivers / dri / i965 / intel_tex.c
1 ../intel/intel_tex.c