Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Issue 715983004: gpu: Change the hex code of conflicted _CHROMIUM macro (Closed)

Created:
6 years, 1 month ago by dshwang
Modified:
6 years, 1 month ago
Reviewers:
no sievers
CC:
chromium-reviews, piman+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

gpu: Change the hex code of conflicted _CHROMIUM macro Following macros are conflicted with khronos header. GL_COMMANDS_ISSUED_CHROMIUM GL_GET_ERROR_QUERY_CHROMIUM GL_LATENCY_QUERY_CHROMIUM GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM The hex code of them is changed to 0x600_ which is unused range. In addition, make build_gles2_cmd_buffer.py detect the collision. Committed: https://crrev.com/7ce131d4ed774c4863eabf81fe40691db235b7db Cr-Commit-Position: refs/heads/master@{#304933}

Patch Set 1 #

Patch Set 2 : run build_gles2_cmd_buffer.py #

Total comments: 2

Patch Set 3 : make build_gles2_cmd_buffer.py check this confliction. #

Total comments: 3

Patch Set 4 : don't use regex, and fit the style #

Unified diffs Side-by-side diffs Delta from patch set Stats (+40 lines, -14 lines) Patch
M gpu/GLES2/gl2extchromium.h View 1 2 4 chunks +5 lines, -5 lines 0 comments Download
M gpu/command_buffer/build_gles2_cmd_buffer.py View 1 2 3 1 chunk +8 lines, -2 lines 0 comments Download
M gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h View 1 2 7 chunks +22 lines, -2 lines 0 comments Download
M ui/gl/gl_bindings.h View 1 2 3 1 chunk +5 lines, -5 lines 0 comments Download

Messages

Total messages: 13 (2 generated)
dshwang
could you review?
6 years, 1 month ago (2014-11-17 16:10:05 UTC) #2
no sievers
Maybe we could have build_gles2_cmd_buffer.py detect collisions? https://codereview.chromium.org/715983004/diff/20001/gpu/GLES2/gl2extchromium.h File gpu/GLES2/gl2extchromium.h (right): https://codereview.chromium.org/715983004/diff/20001/gpu/GLES2/gl2extchromium.h#newcode370 gpu/GLES2/gl2extchromium.h:370: #define GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM ...
6 years, 1 month ago (2014-11-17 20:11:26 UTC) #3
dshwang
On 2014/11/17 20:11:26, sievers wrote: > Maybe we could have build_gles2_cmd_buffer.py detect collisions? Good idea. ...
6 years, 1 month ago (2014-11-18 14:30:42 UTC) #4
dshwang
https://codereview.chromium.org/715983004/diff/40001/ui/gl/gl_bindings.h File ui/gl/gl_bindings.h (right): https://codereview.chromium.org/715983004/diff/40001/ui/gl/gl_bindings.h#newcode119 ui/gl/gl_bindings.h:119: #define GL_COMMANDS_ISSUED_CHROMIUM 0x6004 recently 'git cl format' is changed, ...
6 years, 1 month ago (2014-11-18 14:33:48 UTC) #5
no sievers
https://codereview.chromium.org/715983004/diff/40001/gpu/command_buffer/build_gles2_cmd_buffer.py File gpu/command_buffer/build_gles2_cmd_buffer.py (right): https://codereview.chromium.org/715983004/diff/40001/gpu/command_buffer/build_gles2_cmd_buffer.py#newcode8317 gpu/command_buffer/build_gles2_cmd_buffer.py:8317: elif dict[value] != name and (chromium_re.match(name) I think and ...
6 years, 1 month ago (2014-11-18 19:57:20 UTC) #6
dshwang
On 2014/11/18 19:57:20, sievers wrote: Thank you for review! > https://codereview.chromium.org/715983004/diff/40001/gpu/command_buffer/build_gles2_cmd_buffer.py > File gpu/command_buffer/build_gles2_cmd_buffer.py (right): ...
6 years, 1 month ago (2014-11-19 20:05:51 UTC) #7
no sievers
lgtm, thanks!
6 years, 1 month ago (2014-11-19 20:36:37 UTC) #8
dshwang
On 2014/11/19 20:36:37, sievers wrote: > lgtm, thanks! Thank you for review!
6 years, 1 month ago (2014-11-19 23:04:28 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/715983004/60001
6 years, 1 month ago (2014-11-19 23:05:19 UTC) #11
commit-bot: I haz the power
Committed patchset #4 (id:60001)
6 years, 1 month ago (2014-11-20 00:02:41 UTC) #12
commit-bot: I haz the power
6 years, 1 month ago (2014-11-20 00:03:55 UTC) #13
Message was sent while issue was closed.
Patchset 4 (id:??) landed as
https://crrev.com/7ce131d4ed774c4863eabf81fe40691db235b7db
Cr-Commit-Position: refs/heads/master@{#304933}

Powered by Google App Engine
This is Rietveld 408576698