Updated paths to Mesa sources to the version pulled in via DEPS.

BUG=238755

Review URL: https://chromiumcodereview.appspot.com/16129008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205035 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 538 insertions, 538 deletions

diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium
index a5e36dc..b0c0495 100644
--- a/third_party/mesa/README.chromium
+++ b/third_party/mesa/README.chromium
@@ -13,8 +13,8 @@ Ext headers       include/GL/glext.h
                   include/GL/glxext.h
 SGI GLU library   src/glu/sgi/
 
-The license file in this directory is derived from MesaLib/docs/license.html
-and MesaLib/docs/COPYING.
+The license file in this directory is derived from src/docs/license.html
+and src/docs/COPYING.
 
 Modifications made with initial commit:
 - Converted to utf-8 with: vim +"argdo write ++enc=utf-8" *.c
@@ -22,19 +22,19 @@ Modifications made with initial commit:
 - Added the file README.chromium (this file)
 
 Later modifications (see chromium.patch):
-- Added OSMesaGetProcAddress to MesaLib/src/mesa/drivers/osmesa/osmesa.def
+- Added OSMesaGetProcAddress to src/src/mesa/drivers/osmesa/osmesa.def
 
 - Added #pragma optimize('', off) to:
-  - MesaLib\src\mesa\main\histogram.c
-  - MesaLib\src\mesa\main\image.c
-  - MesaLib\src\mesa\main\mipmap.c
-  - MesaLib\src\mesa\math\m_eval.c
-  - MesaLib\src\mesa\swrast\s_texcombine.c
-
-- Deleted MesaLib/include/EGL/ - it was conflicting with angle
-  - Also deleted MesaLib/include/GLES2/ and MesaLib/include/KHR/ for
+  - src\src\mesa\main\histogram.c
+  - src\src\mesa\main\image.c
+  - src\src\mesa\main\mipmap.c
+  - src\src\mesa\math\m_eval.c
+  - src\src\mesa\swrast\s_texcombine.c
+
+- Deleted src/include/EGL/ - it was conflicting with angle
+  - Also deleted src/include/GLES2/ and src/include/KHR/ for
     similar reasons
-  - Deleted MesaLib/include/GLES/ and MesaLib/include/VG/ because they
+  - Deleted src/include/GLES/ and src/include/VG/ because they
     were unneeded
 
 - Changed these typedefs in glext.h to be the same as khrplatform.h
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index 7edfc16..4f13bde 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -36,7 +36,7 @@
           'type': 'none',
           'direct_dependent_settings': {
             'include_dirs': [
-              'MesaLib/include',
+              'src/include',
             ],
           },
         },
@@ -45,10 +45,10 @@
           'type': 'static_library',
           'include_dirs': [
             '../talloc',
-            'MesaLib/src/glsl',
-            'MesaLib/src/mapi',
-            'MesaLib/src/mesa',
-            'MesaLib/src/mesa/main',
+            'src/src/glsl',
+            'src/src/mapi',
+            'src/src/mesa',
+            'src/src/mesa/main',
           ],
           'dependencies': [
             'mesa_headers',
@@ -61,478 +61,478 @@
           ],
           'sources': [
             '../talloc/talloc.c',
-            'MesaLib/src/glsl/ast.h',
-            'MesaLib/src/glsl/ast_expr.cpp',
-            'MesaLib/src/glsl/ast_function.cpp',
-            'MesaLib/src/glsl/ast_to_hir.cpp',
-            'MesaLib/src/glsl/ast_type.cpp',
-            'MesaLib/src/glsl/builtin_function.cpp',
-            'MesaLib/src/glsl/builtin_types.h',
-            'MesaLib/src/glsl/builtin_variables.h',
-            'MesaLib/src/glsl/glsl_lexer.cpp',
-            'MesaLib/src/glsl/glsl_parser.cpp',
-            'MesaLib/src/glsl/glsl_parser.h',
-            'MesaLib/src/glsl/glsl_parser_extras.cpp',
-            'MesaLib/src/glsl/glsl_parser_extras.h',
-            'MesaLib/src/glsl/glsl_symbol_table.cpp',
-            'MesaLib/src/glsl/glsl_symbol_table.h',
-            'MesaLib/src/glsl/glsl_types.cpp',
-            'MesaLib/src/glsl/glsl_types.h',
-            'MesaLib/src/glsl/hir_field_selection.cpp',
-            'MesaLib/src/glsl/ir.cpp',
-            'MesaLib/src/glsl/ir.h',
-            'MesaLib/src/glsl/ir_algebraic.cpp',
-            'MesaLib/src/glsl/ir_basic_block.cpp',
-            'MesaLib/src/glsl/ir_basic_block.h',
-            'MesaLib/src/glsl/ir_clone.cpp',
-            'MesaLib/src/glsl/ir_constant_expression.cpp',
-            'MesaLib/src/glsl/ir_constant_folding.cpp',
-            'MesaLib/src/glsl/ir_constant_propagation.cpp',
-            'MesaLib/src/glsl/ir_constant_variable.cpp',
-            'MesaLib/src/glsl/ir_copy_propagation.cpp',
-            'MesaLib/src/glsl/ir_dead_code.cpp',
-            'MesaLib/src/glsl/ir_dead_code_local.cpp',
-            'MesaLib/src/glsl/ir_dead_functions.cpp',
-            'MesaLib/src/glsl/ir_div_to_mul_rcp.cpp',
-            'MesaLib/src/glsl/ir_explog_to_explog2.cpp',
-            'MesaLib/src/glsl/ir_expression_flattening.cpp',
-            'MesaLib/src/glsl/ir_expression_flattening.h',
-            'MesaLib/src/glsl/ir_function.cpp',
-            'MesaLib/src/glsl/ir_function_can_inline.cpp',
-            'MesaLib/src/glsl/ir_function_inlining.cpp',
-            'MesaLib/src/glsl/ir_function_inlining.h',
-            'MesaLib/src/glsl/ir_hierarchical_visitor.cpp',
-            'MesaLib/src/glsl/ir_hierarchical_visitor.h',
-            'MesaLib/src/glsl/ir_hv_accept.cpp',
-            'MesaLib/src/glsl/ir_if_simplification.cpp',
-            'MesaLib/src/glsl/ir_if_to_cond_assign.cpp',
-            'MesaLib/src/glsl/ir_import_prototypes.cpp',
-            'MesaLib/src/glsl/ir_lower_jumps.cpp',
-            'MesaLib/src/glsl/ir_mat_op_to_vec.cpp',
-            'MesaLib/src/glsl/ir_mod_to_fract.cpp',
-            'MesaLib/src/glsl/ir_noop_swizzle.cpp',
-            'MesaLib/src/glsl/ir_optimization.h',
-            'MesaLib/src/glsl/ir_print_visitor.cpp',
-            'MesaLib/src/glsl/ir_print_visitor.h',
-            'MesaLib/src/glsl/ir_reader.cpp',
-            'MesaLib/src/glsl/ir_reader.h',
-            'MesaLib/src/glsl/ir_rvalue_visitor.cpp',
-            'MesaLib/src/glsl/ir_rvalue_visitor.h',
-            'MesaLib/src/glsl/ir_set_program_inouts.cpp',
-            'MesaLib/src/glsl/ir_structure_splitting.cpp',
-            'MesaLib/src/glsl/ir_sub_to_add_neg.cpp',
-            'MesaLib/src/glsl/ir_swizzle_swizzle.cpp',
-            'MesaLib/src/glsl/ir_tree_grafting.cpp',
-            'MesaLib/src/glsl/ir_validate.cpp',
-            'MesaLib/src/glsl/ir_variable.cpp',
-            'MesaLib/src/glsl/ir_variable_refcount.cpp',
-            'MesaLib/src/glsl/ir_variable_refcount.h',
-            'MesaLib/src/glsl/ir_vec_index_to_cond_assign.cpp',
-            'MesaLib/src/glsl/ir_vec_index_to_swizzle.cpp',
-            'MesaLib/src/glsl/ir_visitor.h',
-            'MesaLib/src/glsl/link_functions.cpp',
-            'MesaLib/src/glsl/linker.cpp',
-            'MesaLib/src/glsl/linker.h',
-            'MesaLib/src/glsl/list.h',
-            'MesaLib/src/glsl/loop_analysis.cpp',
-            'MesaLib/src/glsl/loop_analysis.h',
-            'MesaLib/src/glsl/loop_controls.cpp',
-            'MesaLib/src/glsl/loop_unroll.cpp',
-            'MesaLib/src/glsl/lower_noise.cpp',
-            'MesaLib/src/glsl/lower_variable_index_to_cond_assign.cpp',
-            'MesaLib/src/glsl/opt_redundant_jumps.cpp',
-            'MesaLib/src/glsl/program.h',
-            'MesaLib/src/glsl/s_expression.cpp',
-            'MesaLib/src/glsl/s_expression.h',
-            'MesaLib/src/glsl/safe_strcmp.c',
-            'MesaLib/src/glsl/safe_strcmp.h',
-            'MesaLib/src/glsl/glcpp/glcpp-lex.c',
-            'MesaLib/src/glsl/glcpp/glcpp-parse.c',
-            'MesaLib/src/glsl/glcpp/glcpp-parse.h',
-            'MesaLib/src/glsl/glcpp/pp.c',
-            'MesaLib/src/mapi/glapi/glapi.h',
-            'MesaLib/src/mapi/glapi/glapi_dispatch.c',
-            'MesaLib/src/mapi/glapi/glapi_entrypoint.c',
-            'MesaLib/src/mapi/glapi/glapi_getproc.c',
-            'MesaLib/src/mapi/glapi/glapi_nop.c',
-            'MesaLib/src/mapi/glapi/glapi_priv.h',
-            'MesaLib/src/mapi/glapi/glapidispatch.h',
-            'MesaLib/src/mapi/glapi/glapioffsets.h',
-            'MesaLib/src/mapi/glapi/glapitable.h',
-            'MesaLib/src/mapi/glapi/glapitemp.h',
-            'MesaLib/src/mapi/glapi/glprocs.h',
-            'MesaLib/src/mapi/mapi/u_compiler.h',
-            'MesaLib/src/mapi/mapi/u_current.c',
-            'MesaLib/src/mapi/mapi/u_current.h',
-            'MesaLib/src/mapi/mapi/u_execmem.c',
-            'MesaLib/src/mapi/mapi/u_execmem.h',
-            'MesaLib/src/mapi/mapi/u_macros.h',
-            'MesaLib/src/mapi/mapi/u_thread.c',
-            'MesaLib/src/mapi/mapi/u_thread.h',
-            'MesaLib/src/mesa/main/accum.c',
-            'MesaLib/src/mesa/main/accum.h',
-            'MesaLib/src/mesa/main/api_arrayelt.c',
-            'MesaLib/src/mesa/main/api_arrayelt.h',
-            'MesaLib/src/mesa/main/api_exec.c',
-            'MesaLib/src/mesa/main/api_exec.h',
-            'MesaLib/src/mesa/main/api_loopback.c',
-            'MesaLib/src/mesa/main/api_loopback.h',
-            'MesaLib/src/mesa/main/api_noop.c',
-            'MesaLib/src/mesa/main/api_noop.h',
-            'MesaLib/src/mesa/main/api_validate.c',
-            'MesaLib/src/mesa/main/api_validate.h',
-            'MesaLib/src/mesa/main/arbprogram.c',
-            'MesaLib/src/mesa/main/arbprogram.h',
-            'MesaLib/src/mesa/main/arrayobj.c',
-            'MesaLib/src/mesa/main/arrayobj.h',
-            'MesaLib/src/mesa/main/atifragshader.c',
-            'MesaLib/src/mesa/main/atifragshader.h',
-            'MesaLib/src/mesa/main/attrib.c',
-            'MesaLib/src/mesa/main/attrib.h',
-            'MesaLib/src/mesa/main/bitset.h',
-            'MesaLib/src/mesa/main/blend.c',
-            'MesaLib/src/mesa/main/blend.h',
-            'MesaLib/src/mesa/main/bufferobj.c',
-            'MesaLib/src/mesa/main/bufferobj.h',
-            'MesaLib/src/mesa/main/buffers.c',
-            'MesaLib/src/mesa/main/buffers.h',
-            'MesaLib/src/mesa/main/clear.c',
-            'MesaLib/src/mesa/main/clear.h',
-            'MesaLib/src/mesa/main/clip.c',
-            'MesaLib/src/mesa/main/clip.h',
-            'MesaLib/src/mesa/main/colormac.h',
-            'MesaLib/src/mesa/main/colortab.c',
-            'MesaLib/src/mesa/main/colortab.h',
-            'MesaLib/src/mesa/main/compiler.h',
-            'MesaLib/src/mesa/main/condrender.c',
-            'MesaLib/src/mesa/main/condrender.h',
-            'MesaLib/src/mesa/main/config.h',
-            'MesaLib/src/mesa/main/context.c',
-            'MesaLib/src/mesa/main/context.h',
-            'MesaLib/src/mesa/main/convolve.c',
-            'MesaLib/src/mesa/main/convolve.h',
-            'MesaLib/src/mesa/main/core.h',
-            'MesaLib/src/mesa/main/cpuinfo.c',
-            'MesaLib/src/mesa/main/cpuinfo.h',
-            'MesaLib/src/mesa/main/dd.h',
-            'MesaLib/src/mesa/main/debug.c',
-            'MesaLib/src/mesa/main/debug.h',
-            'MesaLib/src/mesa/main/depth.c',
-            'MesaLib/src/mesa/main/depth.h',
-            'MesaLib/src/mesa/main/depthstencil.c',
-            'MesaLib/src/mesa/main/depthstencil.h',
-            'MesaLib/src/mesa/main/dispatch.h',
-            'MesaLib/src/mesa/main/dlist.c',
-            'MesaLib/src/mesa/main/dlist.h',
-            'MesaLib/src/mesa/main/dlopen.c',
-            'MesaLib/src/mesa/main/dlopen.h',
-            'MesaLib/src/mesa/main/drawpix.c',
-            'MesaLib/src/mesa/main/drawpix.h',
-            'MesaLib/src/mesa/main/drawtex.c',
-            'MesaLib/src/mesa/main/drawtex.h',
-            'MesaLib/src/mesa/main/enable.c',
-            'MesaLib/src/mesa/main/enable.h',
-            'MesaLib/src/mesa/main/enums.c',
-            'MesaLib/src/mesa/main/enums.h',
-            'MesaLib/src/mesa/main/eval.c',
-            'MesaLib/src/mesa/main/eval.h',
-            'MesaLib/src/mesa/main/execmem.c',
-            'MesaLib/src/mesa/main/extensions.c',
-            'MesaLib/src/mesa/main/extensions.h',
-            'MesaLib/src/mesa/main/fbobject.c',
-            'MesaLib/src/mesa/main/fbobject.h',
-            'MesaLib/src/mesa/main/feedback.c',
-            'MesaLib/src/mesa/main/feedback.h',
-            'MesaLib/src/mesa/main/ffvertex_prog.c',
-            'MesaLib/src/mesa/main/ffvertex_prog.h',
-            'MesaLib/src/mesa/main/fog.c',
-            'MesaLib/src/mesa/main/fog.h',
-            'MesaLib/src/mesa/main/formats.c',
-            'MesaLib/src/mesa/main/formats.h',
-            'MesaLib/src/mesa/main/framebuffer.c',
-            'MesaLib/src/mesa/main/framebuffer.h',
-            'MesaLib/src/mesa/main/get.c',
-            'MesaLib/src/mesa/main/get.h',
-            'MesaLib/src/mesa/main/getstring.c',
-            'MesaLib/src/mesa/main/glheader.h',
-            'MesaLib/src/mesa/main/hash.c',
-            'MesaLib/src/mesa/main/hash.h',
-            'MesaLib/src/mesa/main/hint.c',
-            'MesaLib/src/mesa/main/hint.h',
-            'MesaLib/src/mesa/main/histogram.c',
-            'MesaLib/src/mesa/main/histogram.h',
-            'MesaLib/src/mesa/main/image.c',
-            'MesaLib/src/mesa/main/image.h',
-            'MesaLib/src/mesa/main/imports.c',
-            'MesaLib/src/mesa/main/imports.h',
-            'MesaLib/src/mesa/main/light.c',
-            'MesaLib/src/mesa/main/light.h',
-            'MesaLib/src/mesa/main/lines.c',
-            'MesaLib/src/mesa/main/lines.h',
-            'MesaLib/src/mesa/main/macros.h',
-            'MesaLib/src/mesa/main/matrix.c',
-            'MesaLib/src/mesa/main/matrix.h',
-            'MesaLib/src/mesa/main/mfeatures.h',
-            'MesaLib/src/mesa/main/mipmap.c',
-            'MesaLib/src/mesa/main/mipmap.h',
-            'MesaLib/src/mesa/main/mm.c',
-            'MesaLib/src/mesa/main/mm.h',
-            'MesaLib/src/mesa/main/mtypes.h',
-            'MesaLib/src/mesa/main/multisample.c',
-            'MesaLib/src/mesa/main/multisample.h',
-            'MesaLib/src/mesa/main/nvprogram.c',
-            'MesaLib/src/mesa/main/nvprogram.h',
-            'MesaLib/src/mesa/main/pixel.c',
-            'MesaLib/src/mesa/main/pixel.h',
-            'MesaLib/src/mesa/main/pixelstore.c',
-            'MesaLib/src/mesa/main/pixelstore.h',
-            'MesaLib/src/mesa/main/points.c',
-            'MesaLib/src/mesa/main/points.h',
-            'MesaLib/src/mesa/main/polygon.c',
-            'MesaLib/src/mesa/main/polygon.h',
-            'MesaLib/src/mesa/main/queryobj.c',
-            'MesaLib/src/mesa/main/queryobj.h',
-            'MesaLib/src/mesa/main/rastpos.c',
-            'MesaLib/src/mesa/main/rastpos.h',
-            'MesaLib/src/mesa/main/readpix.c',
-            'MesaLib/src/mesa/main/readpix.h',
-            'MesaLib/src/mesa/main/remap.c',
-            'MesaLib/src/mesa/main/remap.h',
-            'MesaLib/src/mesa/main/remap_helper.h',
-            'MesaLib/src/mesa/main/renderbuffer.c',
-            'MesaLib/src/mesa/main/renderbuffer.h',
-            'MesaLib/src/mesa/main/scissor.c',
-            'MesaLib/src/mesa/main/scissor.h',
-            'MesaLib/src/mesa/main/shaderapi.c',
-            'MesaLib/src/mesa/main/shaderapi.h',
-            'MesaLib/src/mesa/main/shaderobj.c',
-            'MesaLib/src/mesa/main/shaderobj.h',
-            'MesaLib/src/mesa/main/shared.c',
-            'MesaLib/src/mesa/main/shared.h',
-            'MesaLib/src/mesa/main/simple_list.h',
-            'MesaLib/src/mesa/main/state.c',
-            'MesaLib/src/mesa/main/state.h',
-            'MesaLib/src/mesa/main/stencil.c',
-            'MesaLib/src/mesa/main/stencil.h',
-            'MesaLib/src/mesa/main/syncobj.c',
-            'MesaLib/src/mesa/main/syncobj.h',
-            'MesaLib/src/mesa/main/texcompress.c',
-            'MesaLib/src/mesa/main/texcompress.h',
-            'MesaLib/src/mesa/main/texcompress_fxt1.c',
-            'MesaLib/src/mesa/main/texcompress_fxt1.h',
-            'MesaLib/src/mesa/main/texcompress_s3tc.c',
-            'MesaLib/src/mesa/main/texcompress_s3tc.h',
-            'MesaLib/src/mesa/main/texenv.c',
-            'MesaLib/src/mesa/main/texenv.h',
-            'MesaLib/src/mesa/main/texenvprogram.c',
-            'MesaLib/src/mesa/main/texenvprogram.h',
-            'MesaLib/src/mesa/main/texfetch.c',
-            'MesaLib/src/mesa/main/texfetch.h',
-            'MesaLib/src/mesa/main/texfetch_tmp.h',
-            'MesaLib/src/mesa/main/texformat.c',
-            'MesaLib/src/mesa/main/texformat.h',
-            'MesaLib/src/mesa/main/texgen.c',
-            'MesaLib/src/mesa/main/texgen.h',
-            'MesaLib/src/mesa/main/texgetimage.c',
-            'MesaLib/src/mesa/main/texgetimage.h',
-            'MesaLib/src/mesa/main/teximage.c',
-            'MesaLib/src/mesa/main/teximage.h',
-            'MesaLib/src/mesa/main/texobj.c',
-            'MesaLib/src/mesa/main/texobj.h',
-            'MesaLib/src/mesa/main/texpal.c',
-            'MesaLib/src/mesa/main/texpal.h',
-            'MesaLib/src/mesa/main/texparam.c',
-            'MesaLib/src/mesa/main/texparam.h',
-            'MesaLib/src/mesa/main/texrender.c',
-            'MesaLib/src/mesa/main/texrender.h',
-            'MesaLib/src/mesa/main/texstate.c',
-            'MesaLib/src/mesa/main/texstate.h',
-            'MesaLib/src/mesa/main/texstore.c',
-            'MesaLib/src/mesa/main/texstore.h',
-            'MesaLib/src/mesa/main/transformfeedback.c',
-            'MesaLib/src/mesa/main/transformfeedback.h',
-            'MesaLib/src/mesa/main/uniforms.c',
-            'MesaLib/src/mesa/main/uniforms.h',
-            'MesaLib/src/mesa/main/varray.c',
-            'MesaLib/src/mesa/main/varray.h',
-            'MesaLib/src/mesa/main/version.c',
-            'MesaLib/src/mesa/main/version.h',
-            'MesaLib/src/mesa/main/viewport.c',
-            'MesaLib/src/mesa/main/viewport.h',
-            'MesaLib/src/mesa/main/vtxfmt.c',
-            'MesaLib/src/mesa/main/vtxfmt.h',
-            'MesaLib/src/mesa/main/vtxfmt_tmp.h',
-            'MesaLib/src/mesa/math/m_clip_tmp.h',
-            'MesaLib/src/mesa/math/m_copy_tmp.h',
-            'MesaLib/src/mesa/math/m_debug.h',
-            'MesaLib/src/mesa/math/m_debug_clip.c',
-            'MesaLib/src/mesa/math/m_debug_norm.c',
-            'MesaLib/src/mesa/math/m_debug_util.h',
-            'MesaLib/src/mesa/math/m_debug_xform.c',
-            'MesaLib/src/mesa/math/m_dotprod_tmp.h',
-            'MesaLib/src/mesa/math/m_eval.c',
-            'MesaLib/src/mesa/math/m_eval.h',
-            'MesaLib/src/mesa/math/m_matrix.c',
-            'MesaLib/src/mesa/math/m_matrix.h',
-            'MesaLib/src/mesa/math/m_norm_tmp.h',
-            'MesaLib/src/mesa/math/m_trans_tmp.h',
-            'MesaLib/src/mesa/math/m_translate.c',
-            'MesaLib/src/mesa/math/m_translate.h',
-            'MesaLib/src/mesa/math/m_vector.c',
-            'MesaLib/src/mesa/math/m_vector.h',
-            'MesaLib/src/mesa/math/m_xform.c',
-            'MesaLib/src/mesa/math/m_xform.h',
-            'MesaLib/src/mesa/math/m_xform_tmp.h',
-            'MesaLib/src/mesa/program/arbprogparse.c',
-            'MesaLib/src/mesa/program/arbprogparse.h',
-            'MesaLib/src/mesa/program/hash_table.c',
-            'MesaLib/src/mesa/program/hash_table.h',
-            'MesaLib/src/mesa/program/ir_to_mesa.cpp',
-            'MesaLib/src/mesa/program/ir_to_mesa.h',
-            'MesaLib/src/mesa/program/lex.yy.c',
-            'MesaLib/src/mesa/program/nvfragparse.c',
-            'MesaLib/src/mesa/program/nvfragparse.h',
-            'MesaLib/src/mesa/program/nvvertparse.c',
-            'MesaLib/src/mesa/program/nvvertparse.h',
-            'MesaLib/src/mesa/program/prog_cache.c',
-            'MesaLib/src/mesa/program/prog_cache.h',
-            'MesaLib/src/mesa/program/prog_execute.c',
-            'MesaLib/src/mesa/program/prog_execute.h',
-            'MesaLib/src/mesa/program/prog_instruction.c',
-            'MesaLib/src/mesa/program/prog_instruction.h',
-            'MesaLib/src/mesa/program/prog_noise.c',
-            'MesaLib/src/mesa/program/prog_noise.h',
-            'MesaLib/src/mesa/program/prog_optimize.c',
-            'MesaLib/src/mesa/program/prog_optimize.h',
-            'MesaLib/src/mesa/program/prog_parameter.c',
-            'MesaLib/src/mesa/program/prog_parameter.h',
-            'MesaLib/src/mesa/program/prog_parameter_layout.c',
-            'MesaLib/src/mesa/program/prog_parameter_layout.h',
-            'MesaLib/src/mesa/program/prog_print.c',
-            'MesaLib/src/mesa/program/prog_print.h',
-            'MesaLib/src/mesa/program/prog_statevars.c',
-            'MesaLib/src/mesa/program/prog_statevars.h',
-            'MesaLib/src/mesa/program/prog_uniform.c',
-            'MesaLib/src/mesa/program/prog_uniform.h',
-            'MesaLib/src/mesa/program/program.c',
-            'MesaLib/src/mesa/program/program.h',
-            'MesaLib/src/mesa/program/program_parse.tab.c',
-            'MesaLib/src/mesa/program/program_parse.tab.h',
-            'MesaLib/src/mesa/program/program_parse_extra.c',
-            'MesaLib/src/mesa/program/program_parser.h',
-            'MesaLib/src/mesa/program/programopt.c',
-            'MesaLib/src/mesa/program/programopt.h',
-            'MesaLib/src/mesa/program/symbol_table.c',
-            'MesaLib/src/mesa/program/symbol_table.h',
-            'MesaLib/src/mesa/swrast/s_aaline.c',
-            'MesaLib/src/mesa/swrast/s_aaline.h',
-            'MesaLib/src/mesa/swrast/s_aalinetemp.h',
-            'MesaLib/src/mesa/swrast/s_aatriangle.c',
-            'MesaLib/src/mesa/swrast/s_aatriangle.h',
-            'MesaLib/src/mesa/swrast/s_aatritemp.h',
-            'MesaLib/src/mesa/swrast/s_accum.c',
-            'MesaLib/src/mesa/swrast/s_accum.h',
-            'MesaLib/src/mesa/swrast/s_alpha.c',
-            'MesaLib/src/mesa/swrast/s_alpha.h',
-            'MesaLib/src/mesa/swrast/s_atifragshader.c',
-            'MesaLib/src/mesa/swrast/s_atifragshader.h',
-            'MesaLib/src/mesa/swrast/s_bitmap.c',
-            'MesaLib/src/mesa/swrast/s_blend.c',
-            'MesaLib/src/mesa/swrast/s_blend.h',
-            'MesaLib/src/mesa/swrast/s_blit.c',
-            'MesaLib/src/mesa/swrast/s_clear.c',
-            'MesaLib/src/mesa/swrast/s_context.c',
-            'MesaLib/src/mesa/swrast/s_context.h',
-            'MesaLib/src/mesa/swrast/s_copypix.c',
-            'MesaLib/src/mesa/swrast/s_depth.c',
-            'MesaLib/src/mesa/swrast/s_depth.h',
-            'MesaLib/src/mesa/swrast/s_drawpix.c',
-            'MesaLib/src/mesa/swrast/s_feedback.c',
-            'MesaLib/src/mesa/swrast/s_feedback.h',
-            'MesaLib/src/mesa/swrast/s_fog.c',
-            'MesaLib/src/mesa/swrast/s_fog.h',
-            'MesaLib/src/mesa/swrast/s_fragprog.c',
-            'MesaLib/src/mesa/swrast/s_fragprog.h',
-            'MesaLib/src/mesa/swrast/s_lines.c',
-            'MesaLib/src/mesa/swrast/s_lines.h',
-            'MesaLib/src/mesa/swrast/s_linetemp.h',
-            'MesaLib/src/mesa/swrast/s_logic.c',
-            'MesaLib/src/mesa/swrast/s_logic.h',
-            'MesaLib/src/mesa/swrast/s_masking.c',
-            'MesaLib/src/mesa/swrast/s_masking.h',
-            'MesaLib/src/mesa/swrast/s_points.c',
-            'MesaLib/src/mesa/swrast/s_points.h',
-            'MesaLib/src/mesa/swrast/s_readpix.c',
-            'MesaLib/src/mesa/swrast/s_span.c',
-            'MesaLib/src/mesa/swrast/s_span.h',
-            'MesaLib/src/mesa/swrast/s_spantemp.h',
-            'MesaLib/src/mesa/swrast/s_stencil.c',
-            'MesaLib/src/mesa/swrast/s_stencil.h',
-            'MesaLib/src/mesa/swrast/s_texcombine.c',
-            'MesaLib/src/mesa/swrast/s_texcombine.h',
-            'MesaLib/src/mesa/swrast/s_texfilter.c',
-            'MesaLib/src/mesa/swrast/s_texfilter.h',
-            'MesaLib/src/mesa/swrast/s_triangle.c',
-            'MesaLib/src/mesa/swrast/s_triangle.h',
-            'MesaLib/src/mesa/swrast/s_trispan.h',
-            'MesaLib/src/mesa/swrast/s_tritemp.h',
-            'MesaLib/src/mesa/swrast/s_zoom.c',
-            'MesaLib/src/mesa/swrast/s_zoom.h',
-            'MesaLib/src/mesa/swrast/swrast.h',
-            'MesaLib/src/mesa/swrast_setup/ss_context.c',
-            'MesaLib/src/mesa/swrast_setup/ss_context.h',
-            'MesaLib/src/mesa/swrast_setup/ss_triangle.c',
-            'MesaLib/src/mesa/swrast_setup/ss_triangle.h',
-            'MesaLib/src/mesa/swrast_setup/ss_tritmp.h',
-            'MesaLib/src/mesa/swrast_setup/ss_vb.h',
-            'MesaLib/src/mesa/swrast_setup/swrast_setup.h',
-            'MesaLib/src/mesa/tnl/t_context.c',
-            'MesaLib/src/mesa/tnl/t_context.h',
-            'MesaLib/src/mesa/tnl/t_draw.c',
-            'MesaLib/src/mesa/tnl/t_pipeline.c',
-            'MesaLib/src/mesa/tnl/t_pipeline.h',
-            'MesaLib/src/mesa/tnl/t_rasterpos.c',
-            'MesaLib/src/mesa/tnl/t_vb_cliptmp.h',
-            'MesaLib/src/mesa/tnl/t_vb_cull.c',
-            'MesaLib/src/mesa/tnl/t_vb_fog.c',
-            'MesaLib/src/mesa/tnl/t_vb_light.c',
-            'MesaLib/src/mesa/tnl/t_vb_lighttmp.h',
-            'MesaLib/src/mesa/tnl/t_vb_normals.c',
-            'MesaLib/src/mesa/tnl/t_vb_points.c',
-            'MesaLib/src/mesa/tnl/t_vb_program.c',
-            'MesaLib/src/mesa/tnl/t_vb_render.c',
-            'MesaLib/src/mesa/tnl/t_vb_rendertmp.h',
-            'MesaLib/src/mesa/tnl/t_vb_texgen.c',
-            'MesaLib/src/mesa/tnl/t_vb_texmat.c',
-            'MesaLib/src/mesa/tnl/t_vb_vertex.c',
-            'MesaLib/src/mesa/tnl/t_vertex.c',
-            'MesaLib/src/mesa/tnl/t_vertex.h',
-            'MesaLib/src/mesa/tnl/t_vertex_generic.c',
-            'MesaLib/src/mesa/tnl/t_vertex_sse.c',
-            'MesaLib/src/mesa/tnl/t_vp_build.c',
-            'MesaLib/src/mesa/tnl/t_vp_build.h',
-            'MesaLib/src/mesa/tnl/tnl.h',
-            'MesaLib/src/mesa/vbo/vbo.h',
-            'MesaLib/src/mesa/vbo/vbo_attrib.h',
-            'MesaLib/src/mesa/vbo/vbo_attrib_tmp.h',
-            'MesaLib/src/mesa/vbo/vbo_context.c',
-            'MesaLib/src/mesa/vbo/vbo_context.h',
-            'MesaLib/src/mesa/vbo/vbo_exec.c',
-            'MesaLib/src/mesa/vbo/vbo_exec.h',
-            'MesaLib/src/mesa/vbo/vbo_exec_api.c',
-            'MesaLib/src/mesa/vbo/vbo_exec_array.c',
-            'MesaLib/src/mesa/vbo/vbo_exec_draw.c',
-            'MesaLib/src/mesa/vbo/vbo_exec_eval.c',
-            'MesaLib/src/mesa/vbo/vbo_rebase.c',
-            'MesaLib/src/mesa/vbo/vbo_save.c',
-            'MesaLib/src/mesa/vbo/vbo_save.h',
-            'MesaLib/src/mesa/vbo/vbo_save_api.c',
-            'MesaLib/src/mesa/vbo/vbo_save_draw.c',
-            'MesaLib/src/mesa/vbo/vbo_save_loopback.c',
-            'MesaLib/src/mesa/vbo/vbo_split.c',
-            'MesaLib/src/mesa/vbo/vbo_split.h',
-            'MesaLib/src/mesa/vbo/vbo_split_copy.c',
-            'MesaLib/src/mesa/vbo/vbo_split_inplace.c',
+            'src/src/glsl/ast.h',
+            'src/src/glsl/ast_expr.cpp',
+            'src/src/glsl/ast_function.cpp',
+            'src/src/glsl/ast_to_hir.cpp',
+            'src/src/glsl/ast_type.cpp',
+            'src/src/glsl/builtin_function.cpp',
+            'src/src/glsl/builtin_types.h',
+            'src/src/glsl/builtin_variables.h',
+            'src/src/glsl/glsl_lexer.cpp',
+            'src/src/glsl/glsl_parser.cpp',
+            'src/src/glsl/glsl_parser.h',
+            'src/src/glsl/glsl_parser_extras.cpp',
+            'src/src/glsl/glsl_parser_extras.h',
+            'src/src/glsl/glsl_symbol_table.cpp',
+            'src/src/glsl/glsl_symbol_table.h',
+            'src/src/glsl/glsl_types.cpp',
+            'src/src/glsl/glsl_types.h',
+            'src/src/glsl/hir_field_selection.cpp',
+            'src/src/glsl/ir.cpp',
+            'src/src/glsl/ir.h',
+            'src/src/glsl/ir_algebraic.cpp',
+            'src/src/glsl/ir_basic_block.cpp',
+            'src/src/glsl/ir_basic_block.h',
+            'src/src/glsl/ir_clone.cpp',
+            'src/src/glsl/ir_constant_expression.cpp',
+            'src/src/glsl/ir_constant_folding.cpp',
+            'src/src/glsl/ir_constant_propagation.cpp',
+            'src/src/glsl/ir_constant_variable.cpp',
+            'src/src/glsl/ir_copy_propagation.cpp',
+            'src/src/glsl/ir_dead_code.cpp',
+            'src/src/glsl/ir_dead_code_local.cpp',
+            'src/src/glsl/ir_dead_functions.cpp',
+            'src/src/glsl/ir_div_to_mul_rcp.cpp',
+            'src/src/glsl/ir_explog_to_explog2.cpp',
+            'src/src/glsl/ir_expression_flattening.cpp',
+            'src/src/glsl/ir_expression_flattening.h',
+            'src/src/glsl/ir_function.cpp',
+            'src/src/glsl/ir_function_can_inline.cpp',
+            'src/src/glsl/ir_function_inlining.cpp',
+            'src/src/glsl/ir_function_inlining.h',
+            'src/src/glsl/ir_hierarchical_visitor.cpp',
+            'src/src/glsl/ir_hierarchical_visitor.h',
+            'src/src/glsl/ir_hv_accept.cpp',
+            'src/src/glsl/ir_if_simplification.cpp',
+            'src/src/glsl/ir_if_to_cond_assign.cpp',
+            'src/src/glsl/ir_import_prototypes.cpp',
+            'src/src/glsl/ir_lower_jumps.cpp',
+            'src/src/glsl/ir_mat_op_to_vec.cpp',
+            'src/src/glsl/ir_mod_to_fract.cpp',
+            'src/src/glsl/ir_noop_swizzle.cpp',
+            'src/src/glsl/ir_optimization.h',
+            'src/src/glsl/ir_print_visitor.cpp',
+            'src/src/glsl/ir_print_visitor.h',
+            'src/src/glsl/ir_reader.cpp',
+            'src/src/glsl/ir_reader.h',
+            'src/src/glsl/ir_rvalue_visitor.cpp',
+            'src/src/glsl/ir_rvalue_visitor.h',
+            'src/src/glsl/ir_set_program_inouts.cpp',
+            'src/src/glsl/ir_structure_splitting.cpp',
+            'src/src/glsl/ir_sub_to_add_neg.cpp',
+            'src/src/glsl/ir_swizzle_swizzle.cpp',
+            'src/src/glsl/ir_tree_grafting.cpp',
+            'src/src/glsl/ir_validate.cpp',
+            'src/src/glsl/ir_variable.cpp',
+            'src/src/glsl/ir_variable_refcount.cpp',
+            'src/src/glsl/ir_variable_refcount.h',
+            'src/src/glsl/ir_vec_index_to_cond_assign.cpp',
+            'src/src/glsl/ir_vec_index_to_swizzle.cpp',
+            'src/src/glsl/ir_visitor.h',
+            'src/src/glsl/link_functions.cpp',
+            'src/src/glsl/linker.cpp',
+            'src/src/glsl/linker.h',
+            'src/src/glsl/list.h',
+            'src/src/glsl/loop_analysis.cpp',
+            'src/src/glsl/loop_analysis.h',
+            'src/src/glsl/loop_controls.cpp',
+            'src/src/glsl/loop_unroll.cpp',
+            'src/src/glsl/lower_noise.cpp',
+            'src/src/glsl/lower_variable_index_to_cond_assign.cpp',
+            'src/src/glsl/opt_redundant_jumps.cpp',
+            'src/src/glsl/program.h',
+            'src/src/glsl/s_expression.cpp',
+            'src/src/glsl/s_expression.h',
+            'src/src/glsl/safe_strcmp.c',
+            'src/src/glsl/safe_strcmp.h',
+            'src/src/glsl/glcpp/glcpp-lex.c',
+            'src/src/glsl/glcpp/glcpp-parse.c',
+            'src/src/glsl/glcpp/glcpp-parse.h',
+            'src/src/glsl/glcpp/pp.c',
+            'src/src/mapi/glapi/glapi.h',
+            'src/src/mapi/glapi/glapi_dispatch.c',
+            'src/src/mapi/glapi/glapi_entrypoint.c',
+            'src/src/mapi/glapi/glapi_getproc.c',
+            'src/src/mapi/glapi/glapi_nop.c',
+            'src/src/mapi/glapi/glapi_priv.h',
+            'src/src/mapi/glapi/glapidispatch.h',
+            'src/src/mapi/glapi/glapioffsets.h',
+            'src/src/mapi/glapi/glapitable.h',
+            'src/src/mapi/glapi/glapitemp.h',
+            'src/src/mapi/glapi/glprocs.h',
+            'src/src/mapi/mapi/u_compiler.h',
+            'src/src/mapi/mapi/u_current.c',
+            'src/src/mapi/mapi/u_current.h',
+            'src/src/mapi/mapi/u_execmem.c',
+            'src/src/mapi/mapi/u_execmem.h',
+            'src/src/mapi/mapi/u_macros.h',
+            'src/src/mapi/mapi/u_thread.c',
+            'src/src/mapi/mapi/u_thread.h',
+            'src/src/mesa/main/accum.c',
+            'src/src/mesa/main/accum.h',
+            'src/src/mesa/main/api_arrayelt.c',
+            'src/src/mesa/main/api_arrayelt.h',
+            'src/src/mesa/main/api_exec.c',
+            'src/src/mesa/main/api_exec.h',
+            'src/src/mesa/main/api_loopback.c',
+            'src/src/mesa/main/api_loopback.h',
+            'src/src/mesa/main/api_noop.c',
+            'src/src/mesa/main/api_noop.h',
+            'src/src/mesa/main/api_validate.c',
+            'src/src/mesa/main/api_validate.h',
+            'src/src/mesa/main/arbprogram.c',
+            'src/src/mesa/main/arbprogram.h',
+            'src/src/mesa/main/arrayobj.c',
+            'src/src/mesa/main/arrayobj.h',
+            'src/src/mesa/main/atifragshader.c',
+            'src/src/mesa/main/atifragshader.h',
+            'src/src/mesa/main/attrib.c',
+            'src/src/mesa/main/attrib.h',
+            'src/src/mesa/main/bitset.h',
+            'src/src/mesa/main/blend.c',
+            'src/src/mesa/main/blend.h',
+            'src/src/mesa/main/bufferobj.c',
+            'src/src/mesa/main/bufferobj.h',
+            'src/src/mesa/main/buffers.c',
+            'src/src/mesa/main/buffers.h',
+            'src/src/mesa/main/clear.c',
+            'src/src/mesa/main/clear.h',
+            'src/src/mesa/main/clip.c',
+            'src/src/mesa/main/clip.h',
+            'src/src/mesa/main/colormac.h',
+            'src/src/mesa/main/colortab.c',
+            'src/src/mesa/main/colortab.h',
+            'src/src/mesa/main/compiler.h',
+            'src/src/mesa/main/condrender.c',
+            'src/src/mesa/main/condrender.h',
+            'src/src/mesa/main/config.h',
+            'src/src/mesa/main/context.c',
+            'src/src/mesa/main/context.h',
+            'src/src/mesa/main/convolve.c',
+            'src/src/mesa/main/convolve.h',
+            'src/src/mesa/main/core.h',
+            'src/src/mesa/main/cpuinfo.c',
+            'src/src/mesa/main/cpuinfo.h',
+            'src/src/mesa/main/dd.h',
+            'src/src/mesa/main/debug.c',
+            'src/src/mesa/main/debug.h',
+            'src/src/mesa/main/depth.c',
+            'src/src/mesa/main/depth.h',
+            'src/src/mesa/main/depthstencil.c',
+            'src/src/mesa/main/depthstencil.h',
+            'src/src/mesa/main/dispatch.h',
+            'src/src/mesa/main/dlist.c',
+            'src/src/mesa/main/dlist.h',
+            'src/src/mesa/main/dlopen.c',
+            'src/src/mesa/main/dlopen.h',
+            'src/src/mesa/main/drawpix.c',
+            'src/src/mesa/main/drawpix.h',
+            'src/src/mesa/main/drawtex.c',
+            'src/src/mesa/main/drawtex.h',
+            'src/src/mesa/main/enable.c',
+            'src/src/mesa/main/enable.h',
+            'src/src/mesa/main/enums.c',
+            'src/src/mesa/main/enums.h',
+            'src/src/mesa/main/eval.c',
+            'src/src/mesa/main/eval.h',
+            'src/src/mesa/main/execmem.c',
+            'src/src/mesa/main/extensions.c',
+            'src/src/mesa/main/extensions.h',
+            'src/src/mesa/main/fbobject.c',
+            'src/src/mesa/main/fbobject.h',
+            'src/src/mesa/main/feedback.c',
+            'src/src/mesa/main/feedback.h',
+            'src/src/mesa/main/ffvertex_prog.c',
+            'src/src/mesa/main/ffvertex_prog.h',
+            'src/src/mesa/main/fog.c',
+            'src/src/mesa/main/fog.h',
+            'src/src/mesa/main/formats.c',
+            'src/src/mesa/main/formats.h',
+            'src/src/mesa/main/framebuffer.c',
+            'src/src/mesa/main/framebuffer.h',
+            'src/src/mesa/main/get.c',
+            'src/src/mesa/main/get.h',
+            'src/src/mesa/main/getstring.c',
+            'src/src/mesa/main/glheader.h',
+            'src/src/mesa/main/hash.c',
+            'src/src/mesa/main/hash.h',
+            'src/src/mesa/main/hint.c',
+            'src/src/mesa/main/hint.h',
+            'src/src/mesa/main/histogram.c',
+            'src/src/mesa/main/histogram.h',
+            'src/src/mesa/main/image.c',
+            'src/src/mesa/main/image.h',
+            'src/src/mesa/main/imports.c',
+            'src/src/mesa/main/imports.h',
+            'src/src/mesa/main/light.c',
+            'src/src/mesa/main/light.h',
+            'src/src/mesa/main/lines.c',
+            'src/src/mesa/main/lines.h',
+            'src/src/mesa/main/macros.h',
+            'src/src/mesa/main/matrix.c',
+            'src/src/mesa/main/matrix.h',
+            'src/src/mesa/main/mfeatures.h',
+            'src/src/mesa/main/mipmap.c',
+            'src/src/mesa/main/mipmap.h',
+            'src/src/mesa/main/mm.c',
+            'src/src/mesa/main/mm.h',
+            'src/src/mesa/main/mtypes.h',
+            'src/src/mesa/main/multisample.c',
+            'src/src/mesa/main/multisample.h',
+            'src/src/mesa/main/nvprogram.c',
+            'src/src/mesa/main/nvprogram.h',
+            'src/src/mesa/main/pixel.c',
+            'src/src/mesa/main/pixel.h',
+            'src/src/mesa/main/pixelstore.c',
+            'src/src/mesa/main/pixelstore.h',
+            'src/src/mesa/main/points.c',
+            'src/src/mesa/main/points.h',
+            'src/src/mesa/main/polygon.c',
+            'src/src/mesa/main/polygon.h',
+            'src/src/mesa/main/queryobj.c',
+            'src/src/mesa/main/queryobj.h',
+            'src/src/mesa/main/rastpos.c',
+            'src/src/mesa/main/rastpos.h',
+            'src/src/mesa/main/readpix.c',
+            'src/src/mesa/main/readpix.h',
+            'src/src/mesa/main/remap.c',
+            'src/src/mesa/main/remap.h',
+            'src/src/mesa/main/remap_helper.h',
+            'src/src/mesa/main/renderbuffer.c',
+            'src/src/mesa/main/renderbuffer.h',
+            'src/src/mesa/main/scissor.c',
+            'src/src/mesa/main/scissor.h',
+            'src/src/mesa/main/shaderapi.c',
+            'src/src/mesa/main/shaderapi.h',
+            'src/src/mesa/main/shaderobj.c',
+            'src/src/mesa/main/shaderobj.h',
+            'src/src/mesa/main/shared.c',
+            'src/src/mesa/main/shared.h',
+            'src/src/mesa/main/simple_list.h',
+            'src/src/mesa/main/state.c',
+            'src/src/mesa/main/state.h',
+            'src/src/mesa/main/stencil.c',
+            'src/src/mesa/main/stencil.h',
+            'src/src/mesa/main/syncobj.c',
+            'src/src/mesa/main/syncobj.h',
+            'src/src/mesa/main/texcompress.c',
+            'src/src/mesa/main/texcompress.h',
+            'src/src/mesa/main/texcompress_fxt1.c',
+            'src/src/mesa/main/texcompress_fxt1.h',
+            'src/src/mesa/main/texcompress_s3tc.c',
+            'src/src/mesa/main/texcompress_s3tc.h',
+            'src/src/mesa/main/texenv.c',
+            'src/src/mesa/main/texenv.h',
+            'src/src/mesa/main/texenvprogram.c',
+            'src/src/mesa/main/texenvprogram.h',
+            'src/src/mesa/main/texfetch.c',
+            'src/src/mesa/main/texfetch.h',
+            'src/src/mesa/main/texfetch_tmp.h',
+            'src/src/mesa/main/texformat.c',
+            'src/src/mesa/main/texformat.h',
+            'src/src/mesa/main/texgen.c',
+            'src/src/mesa/main/texgen.h',
+            'src/src/mesa/main/texgetimage.c',
+            'src/src/mesa/main/texgetimage.h',
+            'src/src/mesa/main/teximage.c',
+            'src/src/mesa/main/teximage.h',
+            'src/src/mesa/main/texobj.c',
+            'src/src/mesa/main/texobj.h',
+            'src/src/mesa/main/texpal.c',
+            'src/src/mesa/main/texpal.h',
+            'src/src/mesa/main/texparam.c',
+            'src/src/mesa/main/texparam.h',
+            'src/src/mesa/main/texrender.c',
+            'src/src/mesa/main/texrender.h',
+            'src/src/mesa/main/texstate.c',
+            'src/src/mesa/main/texstate.h',
+            'src/src/mesa/main/texstore.c',
+            'src/src/mesa/main/texstore.h',
+            'src/src/mesa/main/transformfeedback.c',
+            'src/src/mesa/main/transformfeedback.h',
+            'src/src/mesa/main/uniforms.c',
+            'src/src/mesa/main/uniforms.h',
+            'src/src/mesa/main/varray.c',
+            'src/src/mesa/main/varray.h',
+            'src/src/mesa/main/version.c',
+            'src/src/mesa/main/version.h',
+            'src/src/mesa/main/viewport.c',
+            'src/src/mesa/main/viewport.h',
+            'src/src/mesa/main/vtxfmt.c',
+            'src/src/mesa/main/vtxfmt.h',
+            'src/src/mesa/main/vtxfmt_tmp.h',
+            'src/src/mesa/math/m_clip_tmp.h',
+            'src/src/mesa/math/m_copy_tmp.h',
+            'src/src/mesa/math/m_debug.h',
+            'src/src/mesa/math/m_debug_clip.c',
+            'src/src/mesa/math/m_debug_norm.c',
+            'src/src/mesa/math/m_debug_util.h',
+            'src/src/mesa/math/m_debug_xform.c',
+            'src/src/mesa/math/m_dotprod_tmp.h',
+            'src/src/mesa/math/m_eval.c',
+            'src/src/mesa/math/m_eval.h',
+            'src/src/mesa/math/m_matrix.c',
+            'src/src/mesa/math/m_matrix.h',
+            'src/src/mesa/math/m_norm_tmp.h',
+            'src/src/mesa/math/m_trans_tmp.h',
+            'src/src/mesa/math/m_translate.c',
+            'src/src/mesa/math/m_translate.h',
+            'src/src/mesa/math/m_vector.c',
+            'src/src/mesa/math/m_vector.h',
+            'src/src/mesa/math/m_xform.c',
+            'src/src/mesa/math/m_xform.h',
+            'src/src/mesa/math/m_xform_tmp.h',
+            'src/src/mesa/program/arbprogparse.c',
+            'src/src/mesa/program/arbprogparse.h',
+            'src/src/mesa/program/hash_table.c',
+            'src/src/mesa/program/hash_table.h',
+            'src/src/mesa/program/ir_to_mesa.cpp',
+            'src/src/mesa/program/ir_to_mesa.h',
+            'src/src/mesa/program/lex.yy.c',
+            'src/src/mesa/program/nvfragparse.c',
+            'src/src/mesa/program/nvfragparse.h',
+            'src/src/mesa/program/nvvertparse.c',
+            'src/src/mesa/program/nvvertparse.h',
+            'src/src/mesa/program/prog_cache.c',
+            'src/src/mesa/program/prog_cache.h',
+            'src/src/mesa/program/prog_execute.c',
+            'src/src/mesa/program/prog_execute.h',
+            'src/src/mesa/program/prog_instruction.c',
+            'src/src/mesa/program/prog_instruction.h',
+            'src/src/mesa/program/prog_noise.c',
+            'src/src/mesa/program/prog_noise.h',
+            'src/src/mesa/program/prog_optimize.c',
+            'src/src/mesa/program/prog_optimize.h',
+            'src/src/mesa/program/prog_parameter.c',
+            'src/src/mesa/program/prog_parameter.h',
+            'src/src/mesa/program/prog_parameter_layout.c',
+            'src/src/mesa/program/prog_parameter_layout.h',
+            'src/src/mesa/program/prog_print.c',
+            'src/src/mesa/program/prog_print.h',
+            'src/src/mesa/program/prog_statevars.c',
+            'src/src/mesa/program/prog_statevars.h',
+            'src/src/mesa/program/prog_uniform.c',
+            'src/src/mesa/program/prog_uniform.h',
+            'src/src/mesa/program/program.c',
+            'src/src/mesa/program/program.h',
+            'src/src/mesa/program/program_parse.tab.c',
+            'src/src/mesa/program/program_parse.tab.h',
+            'src/src/mesa/program/program_parse_extra.c',
+            'src/src/mesa/program/program_parser.h',
+            'src/src/mesa/program/programopt.c',
+            'src/src/mesa/program/programopt.h',
+            'src/src/mesa/program/symbol_table.c',
+            'src/src/mesa/program/symbol_table.h',
+            'src/src/mesa/swrast/s_aaline.c',
+            'src/src/mesa/swrast/s_aaline.h',
+            'src/src/mesa/swrast/s_aalinetemp.h',
+            'src/src/mesa/swrast/s_aatriangle.c',
+            'src/src/mesa/swrast/s_aatriangle.h',
+            'src/src/mesa/swrast/s_aatritemp.h',
+            'src/src/mesa/swrast/s_accum.c',
+            'src/src/mesa/swrast/s_accum.h',
+            'src/src/mesa/swrast/s_alpha.c',
+            'src/src/mesa/swrast/s_alpha.h',
+            'src/src/mesa/swrast/s_atifragshader.c',
+            'src/src/mesa/swrast/s_atifragshader.h',
+            'src/src/mesa/swrast/s_bitmap.c',
+            'src/src/mesa/swrast/s_blend.c',
+            'src/src/mesa/swrast/s_blend.h',
+            'src/src/mesa/swrast/s_blit.c',
+            'src/src/mesa/swrast/s_clear.c',
+            'src/src/mesa/swrast/s_context.c',
+            'src/src/mesa/swrast/s_context.h',
+            'src/src/mesa/swrast/s_copypix.c',
+            'src/src/mesa/swrast/s_depth.c',
+            'src/src/mesa/swrast/s_depth.h',
+            'src/src/mesa/swrast/s_drawpix.c',
+            'src/src/mesa/swrast/s_feedback.c',
+            'src/src/mesa/swrast/s_feedback.h',
+            'src/src/mesa/swrast/s_fog.c',
+            'src/src/mesa/swrast/s_fog.h',
+            'src/src/mesa/swrast/s_fragprog.c',
+            'src/src/mesa/swrast/s_fragprog.h',
+            'src/src/mesa/swrast/s_lines.c',
+            'src/src/mesa/swrast/s_lines.h',
+            'src/src/mesa/swrast/s_linetemp.h',
+            'src/src/mesa/swrast/s_logic.c',
+            'src/src/mesa/swrast/s_logic.h',
+            'src/src/mesa/swrast/s_masking.c',
+            'src/src/mesa/swrast/s_masking.h',
+            'src/src/mesa/swrast/s_points.c',
+            'src/src/mesa/swrast/s_points.h',
+            'src/src/mesa/swrast/s_readpix.c',
+            'src/src/mesa/swrast/s_span.c',
+            'src/src/mesa/swrast/s_span.h',
+            'src/src/mesa/swrast/s_spantemp.h',
+            'src/src/mesa/swrast/s_stencil.c',
+            'src/src/mesa/swrast/s_stencil.h',
+            'src/src/mesa/swrast/s_texcombine.c',
+            'src/src/mesa/swrast/s_texcombine.h',
+            'src/src/mesa/swrast/s_texfilter.c',
+            'src/src/mesa/swrast/s_texfilter.h',
+            'src/src/mesa/swrast/s_triangle.c',
+            'src/src/mesa/swrast/s_triangle.h',
+            'src/src/mesa/swrast/s_trispan.h',
+            'src/src/mesa/swrast/s_tritemp.h',
+            'src/src/mesa/swrast/s_zoom.c',
+            'src/src/mesa/swrast/s_zoom.h',
+            'src/src/mesa/swrast/swrast.h',
+            'src/src/mesa/swrast_setup/ss_context.c',
+            'src/src/mesa/swrast_setup/ss_context.h',
+            'src/src/mesa/swrast_setup/ss_triangle.c',
+            'src/src/mesa/swrast_setup/ss_triangle.h',
+            'src/src/mesa/swrast_setup/ss_tritmp.h',
+            'src/src/mesa/swrast_setup/ss_vb.h',
+            'src/src/mesa/swrast_setup/swrast_setup.h',
+            'src/src/mesa/tnl/t_context.c',
+            'src/src/mesa/tnl/t_context.h',
+            'src/src/mesa/tnl/t_draw.c',
+            'src/src/mesa/tnl/t_pipeline.c',
+            'src/src/mesa/tnl/t_pipeline.h',
+            'src/src/mesa/tnl/t_rasterpos.c',
+            'src/src/mesa/tnl/t_vb_cliptmp.h',
+            'src/src/mesa/tnl/t_vb_cull.c',
+            'src/src/mesa/tnl/t_vb_fog.c',
+            'src/src/mesa/tnl/t_vb_light.c',
+            'src/src/mesa/tnl/t_vb_lighttmp.h',
+            'src/src/mesa/tnl/t_vb_normals.c',
+            'src/src/mesa/tnl/t_vb_points.c',
+            'src/src/mesa/tnl/t_vb_program.c',
+            'src/src/mesa/tnl/t_vb_render.c',
+            'src/src/mesa/tnl/t_vb_rendertmp.h',
+            'src/src/mesa/tnl/t_vb_texgen.c',
+            'src/src/mesa/tnl/t_vb_texmat.c',
+            'src/src/mesa/tnl/t_vb_vertex.c',
+            'src/src/mesa/tnl/t_vertex.c',
+            'src/src/mesa/tnl/t_vertex.h',
+            'src/src/mesa/tnl/t_vertex_generic.c',
+            'src/src/mesa/tnl/t_vertex_sse.c',
+            'src/src/mesa/tnl/t_vp_build.c',
+            'src/src/mesa/tnl/t_vp_build.h',
+            'src/src/mesa/tnl/tnl.h',
+            'src/src/mesa/vbo/vbo.h',
+            'src/src/mesa/vbo/vbo_attrib.h',
+            'src/src/mesa/vbo/vbo_attrib_tmp.h',
+            'src/src/mesa/vbo/vbo_context.c',
+            'src/src/mesa/vbo/vbo_context.h',
+            'src/src/mesa/vbo/vbo_exec.c',
+            'src/src/mesa/vbo/vbo_exec.h',
+            'src/src/mesa/vbo/vbo_exec_api.c',
+            'src/src/mesa/vbo/vbo_exec_array.c',
+            'src/src/mesa/vbo/vbo_exec_draw.c',
+            'src/src/mesa/vbo/vbo_exec_eval.c',
+            'src/src/mesa/vbo/vbo_rebase.c',
+            'src/src/mesa/vbo/vbo_save.c',
+            'src/src/mesa/vbo/vbo_save.h',
+            'src/src/mesa/vbo/vbo_save_api.c',
+            'src/src/mesa/vbo/vbo_save_draw.c',
+            'src/src/mesa/vbo/vbo_save_loopback.c',
+            'src/src/mesa/vbo/vbo_split.c',
+            'src/src/mesa/vbo/vbo_split.h',
+            'src/src/mesa/vbo/vbo_split_copy.c',
+            'src/src/mesa/vbo/vbo_split_inplace.c',
           ],
           'conditions': [
             ['clang == 1', {
@@ -581,14 +581,14 @@
           'conditions': [
             ['OS=="mac"', {
               'sources': [
-                'MesaLib/src/mesa/drivers/osmesa/empty.cpp',
+                'src/src/mesa/drivers/osmesa/empty.cpp',
               ],
             }],
           ],
           'include_dirs': [
-            'MesaLib/src/mapi',
-            'MesaLib/src/mesa',
-            'MesaLib/src/mesa/drivers',
+            'src/src/mapi',
+            'src/src/mesa',
+            'src/src/mesa/drivers',
           ],
           # TODO(scottmg): http://crbug.com/143877 These should be removed if
           # Mesa is ever rolled and the warnings are fixed.
@@ -596,12 +596,12 @@
               4005, 4133, 4267,
           ],
           'sources': [
-            'MesaLib/src/mesa/drivers/common/driverfuncs.c',
-            'MesaLib/src/mesa/drivers/common/driverfuncs.h',
-            'MesaLib/src/mesa/drivers/common/meta.c',
-            'MesaLib/src/mesa/drivers/common/meta.h',
-            'MesaLib/src/mesa/drivers/osmesa/osmesa.c',
-            'MesaLib/src/mesa/drivers/osmesa/osmesa.def',
+            'src/src/mesa/drivers/common/driverfuncs.c',
+            'src/src/mesa/drivers/common/driverfuncs.h',
+            'src/src/mesa/drivers/common/meta.c',
+            'src/src/mesa/drivers/common/meta.h',
+            'src/src/mesa/drivers/osmesa/osmesa.c',
+            'src/src/mesa/drivers/osmesa/osmesa.def',
           ],
         },
       ],
@@ -612,11 +612,11 @@
           'target_name': 'mesa_headers',
           'type': 'none',
           'variables': {
-            'headers_root_path': 'MesaLib/include',
+            'headers_root_path': 'src/include',
             # This list can easily be updated using the command below:
-            # find third_party/mesa/MesaLib/include -iname '*.h' \
+            # find third_party/mesa/src/include -iname '*.h' \
             # -printf "'%p',\n" | grep -v internal | sed -e \
-            # 's|third_party/mesa/MesaLib/include/||' | sort -u
+            # 's|third_party/mesa/src/include/||' | sort -u
             'header_filenames': [
               'GL/glext.h',
               'GL/glfbdev.h',
diff --git a/third_party/mesa/mesa.gypi b/third_party/mesa/mesa.gypi
index d4e757e..bbf7166 100644
--- a/third_party/mesa/mesa.gypi
+++ b/third_party/mesa/mesa.gypi
@@ -15,47 +15,47 @@
     # because they need to include EGL headers which might be driver specific.
     #
     'mesa_egl_sources': [
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglapi.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglapi.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglarray.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglarray.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglcompiler.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglconfig.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglconfig.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglcontext.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglcontext.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglcurrent.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglcurrent.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/egldefines.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/egldisplay.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/egldisplay.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglapi.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglapi.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglarray.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglarray.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglcompiler.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglconfig.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglconfig.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglcontext.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglcontext.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglcurrent.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglcurrent.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/egldefines.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/egldisplay.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/egldisplay.h',
       #
       # Do not include egldriver.c which dynamically loads a driver at
       # runtime. We will statically bake our driver with the API dispatcher.
       #
-      # '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/egldriver.c',
+      # '<(DEPTH)/third_party/mesa/src/src/egl/main/egldriver.c',
       #
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/egldriver.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglglobals.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglglobals.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglimage.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglimage.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/egllog.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/egllog.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglmisc.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglmisc.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglmode.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglmode.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglmutex.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglscreen.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglscreen.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglstring.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglstring.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglsurface.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglsurface.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglsync.c',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/eglsync.h',
-      '<(DEPTH)/third_party/mesa/MesaLib/src/egl/main/egltypedefs.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/egldriver.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglglobals.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglglobals.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglimage.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglimage.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/egllog.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/egllog.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglmisc.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglmisc.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglmode.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglmode.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglmutex.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglscreen.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglscreen.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglstring.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglstring.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglsurface.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglsurface.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglsync.c',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/eglsync.h',
+      '<(DEPTH)/third_party/mesa/src/src/egl/main/egltypedefs.h',
     ],
   },
 }