| commit | 036438089d99d45c6b472cef75f77d9167eecbe0 | [log] [tgz] |
|---|---|---|
| author | Daniel Bratell <bratell@opera.com> | Sat Jul 21 00:02:41 2018 |
| committer | Commit Bot <commit-bot@chromium.org> | Sat Jul 21 00:02:41 2018 |
| tree | 7b6ed42fcb427b81a579121cf1bcaee9303d3b72 | |
| parent | 23e2bcb7bd0a3123f52c056965d42821ba03f44c [diff] |
[jumbo] undef SHADER macros after using them Several files in gpu/command_buffer/service use local SHADER macros. If they are compiled together in a jumbo build those macros will collide and prevent the compilation. This patch undefs the macros after use. An alternative is to give them unique names. Bug: 864986 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel Change-Id: I9de4011e1d609e5658a9d6cbe1775a3146364fa1 Reviewed-on: https://chromium-review.googlesource.com/1143265 Reviewed-by: Antoine Labour <piman@chromium.org> Commit-Queue: Daniel Bratell <bratell@opera.com> Cr-Commit-Position: refs/heads/master@{#577044}
diff --git a/gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.cc b/gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.cc index 919c72fe1..0e31468 100644 --- a/gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.cc +++ b/gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.cc
@@ -1847,3 +1847,5 @@ } // namespace gles2 } // namespace gpu + +#undef SHADER
diff --git a/gpu/command_buffer/service/gles2_cmd_clear_framebuffer.cc b/gpu/command_buffer/service/gles2_cmd_clear_framebuffer.cc index 359fac03..cbd7fb66 100644 --- a/gpu/command_buffer/service/gles2_cmd_clear_framebuffer.cc +++ b/gpu/command_buffer/service/gles2_cmd_clear_framebuffer.cc
@@ -34,6 +34,7 @@ } ), }; +#undef SHADER } // namespace