From 1c629b00ea176d1ffd8dcb97356efe3f60d2916b Mon Sep 17 00:00:00 2001
From: jamesr <jamesr@chromium.org>
Date: Mon, 29 Sep 2014 10:38:32 -0700
Subject: [PATCH] Roll mesa 457812d9:9731cb9

This rolls to a version of our mesa library that does not have the
CL, GLES2, EGL or VG headers.  We should never use CL/VG headers, we
should always use GLES2 and EGL headers from khronos.

Review URL: https://codereview.chromium.org/612523002

Cr-Commit-Position: refs/heads/master@{#297201}
---
 DEPS                              |  2 +-
 third_party/mesa/BUILD.gn         |  4 ----
 third_party/mesa/mesa.gyp         |  4 ----
 third_party/mesa/mesa_gensrc.gypi | 22 ----------------------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/DEPS b/DEPS
index d6a231417592..024e0767950b 100644
--- a/DEPS
+++ b/DEPS
@@ -284,7 +284,7 @@ deps = {
    Var('chromium_git') + '/chromium/cdm.git' + '@' + '41c8183a3966a17b440dbe606cb2840e1b7ce884',
 
   'src/third_party/mesa/src':
-   Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '457812d99a213dedf1c4cd38018ff48118d0c44f',
+   Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '9731cb962963bca8a05f3d0f6ea40c3a781f0537',
 
   'src/third_party/cld_2/src':
     Var('chromium_git') + '/external/cld2.git' + '@' + 'bb5c092e8c02dcc2319c5056aff2182199d51c2f',
diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn
index a883d418d9ce..9d339946a27b 100644
--- a/third_party/mesa/BUILD.gn
+++ b/third_party/mesa/BUILD.gn
@@ -272,7 +272,6 @@ static_library("mesa") {
     "src/src/mesa/main/api_arrayelt.h",
     "src/src/mesa/main/api_exec.c",
     "src/src/mesa/main/api_exec.h",
-    "$generated_src_dir/mesa/api_exec_es1.c",
     "src/src/mesa/main/api_loopback.c",
     "src/src/mesa/main/api_loopback.h",
     "src/src/mesa/main/api_validate.c",
@@ -321,8 +320,6 @@ static_library("mesa") {
     "src/src/mesa/main/enums.h",
     "src/src/mesa/main/errors.c",
     "src/src/mesa/main/errors.h",
-    "src/src/mesa/main/es1_conversion.c",
-    "src/src/mesa/main/es1_conversion.h",
     "src/src/mesa/main/eval.c",
     "src/src/mesa/main/eval.h",
     "src/src/mesa/main/execmem.c",
@@ -388,7 +385,6 @@ static_library("mesa") {
     "src/src/mesa/main/points.h",
     "src/src/mesa/main/polygon.c",
     "src/src/mesa/main/polygon.h",
-    "src/src/mesa/main/querymatrix.c",
     "src/src/mesa/main/queryobj.c",
     "src/src/mesa/main/queryobj.h",
     "src/src/mesa/main/rastpos.c",
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index be008d4c1503..bc115e15d37f 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -298,7 +298,6 @@
         'src/src/mesa/main/api_arrayelt.h',
         'src/src/mesa/main/api_exec.c',
         'src/src/mesa/main/api_exec.h',
-        '<(generated_src_dir)/mesa/api_exec_es1.c',
         'src/src/mesa/main/api_loopback.c',
         'src/src/mesa/main/api_loopback.h',
         'src/src/mesa/main/api_validate.c',
@@ -347,8 +346,6 @@
         'src/src/mesa/main/enums.h',
         'src/src/mesa/main/errors.c',
         'src/src/mesa/main/errors.h',
-        'src/src/mesa/main/es1_conversion.c',
-        'src/src/mesa/main/es1_conversion.h',
         'src/src/mesa/main/eval.c',
         'src/src/mesa/main/eval.h',
         'src/src/mesa/main/execmem.c',
@@ -414,7 +411,6 @@
         'src/src/mesa/main/points.h',
         'src/src/mesa/main/polygon.c',
         'src/src/mesa/main/polygon.h',
-        'src/src/mesa/main/querymatrix.c',
         'src/src/mesa/main/queryobj.c',
         'src/src/mesa/main/queryobj.h',
         'src/src/mesa/main/rastpos.c',
diff --git a/third_party/mesa/mesa_gensrc.gypi b/third_party/mesa/mesa_gensrc.gypi
index 8b4b225a4c7c..f35c23e0031a 100644
--- a/third_party/mesa/mesa_gensrc.gypi
+++ b/third_party/mesa/mesa_gensrc.gypi
@@ -584,28 +584,6 @@
           ],
           'message': "Generating indirect_size.c ...",
         },
-        {
-          'action_name': 'api_exec_es1_c',
-          'inputs': [
-            '<@(xmlfiles)',
-            'redirectoutput.py',
-            'src/src/mesa/main/es_generator.py',
-          ],
-          'outputs': [
-            '<(generated_src_dir)/mesa/api_exec_es1.c',
-          ],
-          'action': [
-            'python',
-            'redirectoutput.py',
-            '<(generated_src_dir)/mesa/api_exec_es1.c',
-            'src/src/mesa/main/es_generator.py',
-            '-S',
-            'src/src/mesa/main/APIspec.xml',
-            '-V',
-            'GLES1.1',
-          ],
-          'message': "Generating api_exec_es1.c ...",
-        },
         {
           'action_name': 'git_sha1_h',
           'inputs': [