Commit bc02b84f authored by Antoine Labour's avatar Antoine Labour Committed by Commit Bot

Roll third_party/mesa ef811c6..92521a7

Includes the following commit:
92521a7 Update GLDEBUGPROCARB to the latest spec version

Bug: 788949
Change-Id: I89e981718b42e375db7c2d4eb236643631d80c44
Reviewed-on: https://chromium-review.googlesource.com/946903Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Commit-Queue: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#540683}
parent 6e0c0203
......@@ -514,7 +514,7 @@ deps = {
},
'src/third_party/mesa/src':
Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + 'ef811c6bd4de74e13e7035ca882cc77f85793fef',
Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '92521a7a302b58aaa242b90192eaddb67ea3d0c2',
# GNU binutils assembler for x86-64.
'src/third_party/mingw-w64/mingw/bin': {
......
......@@ -69,3 +69,6 @@ Modifications made:
- Merge http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a6ec26
Regenerated glsl_lexer.cc using Linux 3.13.0-63 (Ubuntu 14.04), Flex 2.5.39.
- update GLDEBUGPROCARB typedef to latest spec version to avoid type mismatch
between headers (making userParam a const GLvoid*).
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