Commit 1c629b00 authored by jamesr's avatar jamesr Committed by Commit bot

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}
parent aba96951
...@@ -284,7 +284,7 @@ deps = { ...@@ -284,7 +284,7 @@ deps = {
Var('chromium_git') + '/chromium/cdm.git' + '@' + '41c8183a3966a17b440dbe606cb2840e1b7ce884', Var('chromium_git') + '/chromium/cdm.git' + '@' + '41c8183a3966a17b440dbe606cb2840e1b7ce884',
'src/third_party/mesa/src': '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': 'src/third_party/cld_2/src':
Var('chromium_git') + '/external/cld2.git' + '@' + 'bb5c092e8c02dcc2319c5056aff2182199d51c2f', Var('chromium_git') + '/external/cld2.git' + '@' + 'bb5c092e8c02dcc2319c5056aff2182199d51c2f',
......
...@@ -272,7 +272,6 @@ static_library("mesa") { ...@@ -272,7 +272,6 @@ static_library("mesa") {
"src/src/mesa/main/api_arrayelt.h", "src/src/mesa/main/api_arrayelt.h",
"src/src/mesa/main/api_exec.c", "src/src/mesa/main/api_exec.c",
"src/src/mesa/main/api_exec.h", "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.c",
"src/src/mesa/main/api_loopback.h", "src/src/mesa/main/api_loopback.h",
"src/src/mesa/main/api_validate.c", "src/src/mesa/main/api_validate.c",
...@@ -321,8 +320,6 @@ static_library("mesa") { ...@@ -321,8 +320,6 @@ static_library("mesa") {
"src/src/mesa/main/enums.h", "src/src/mesa/main/enums.h",
"src/src/mesa/main/errors.c", "src/src/mesa/main/errors.c",
"src/src/mesa/main/errors.h", "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.c",
"src/src/mesa/main/eval.h", "src/src/mesa/main/eval.h",
"src/src/mesa/main/execmem.c", "src/src/mesa/main/execmem.c",
...@@ -388,7 +385,6 @@ static_library("mesa") { ...@@ -388,7 +385,6 @@ static_library("mesa") {
"src/src/mesa/main/points.h", "src/src/mesa/main/points.h",
"src/src/mesa/main/polygon.c", "src/src/mesa/main/polygon.c",
"src/src/mesa/main/polygon.h", "src/src/mesa/main/polygon.h",
"src/src/mesa/main/querymatrix.c",
"src/src/mesa/main/queryobj.c", "src/src/mesa/main/queryobj.c",
"src/src/mesa/main/queryobj.h", "src/src/mesa/main/queryobj.h",
"src/src/mesa/main/rastpos.c", "src/src/mesa/main/rastpos.c",
......
...@@ -298,7 +298,6 @@ ...@@ -298,7 +298,6 @@
'src/src/mesa/main/api_arrayelt.h', 'src/src/mesa/main/api_arrayelt.h',
'src/src/mesa/main/api_exec.c', 'src/src/mesa/main/api_exec.c',
'src/src/mesa/main/api_exec.h', '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.c',
'src/src/mesa/main/api_loopback.h', 'src/src/mesa/main/api_loopback.h',
'src/src/mesa/main/api_validate.c', 'src/src/mesa/main/api_validate.c',
...@@ -347,8 +346,6 @@ ...@@ -347,8 +346,6 @@
'src/src/mesa/main/enums.h', 'src/src/mesa/main/enums.h',
'src/src/mesa/main/errors.c', 'src/src/mesa/main/errors.c',
'src/src/mesa/main/errors.h', '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.c',
'src/src/mesa/main/eval.h', 'src/src/mesa/main/eval.h',
'src/src/mesa/main/execmem.c', 'src/src/mesa/main/execmem.c',
...@@ -414,7 +411,6 @@ ...@@ -414,7 +411,6 @@
'src/src/mesa/main/points.h', 'src/src/mesa/main/points.h',
'src/src/mesa/main/polygon.c', 'src/src/mesa/main/polygon.c',
'src/src/mesa/main/polygon.h', 'src/src/mesa/main/polygon.h',
'src/src/mesa/main/querymatrix.c',
'src/src/mesa/main/queryobj.c', 'src/src/mesa/main/queryobj.c',
'src/src/mesa/main/queryobj.h', 'src/src/mesa/main/queryobj.h',
'src/src/mesa/main/rastpos.c', 'src/src/mesa/main/rastpos.c',
......
...@@ -584,28 +584,6 @@ ...@@ -584,28 +584,6 @@
], ],
'message': "Generating indirect_size.c ...", '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', 'action_name': 'git_sha1_h',
'inputs': [ 'inputs': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment