ui/gl/gl_bindings.h - Issue 715983004: gpu: Change the hex code of conflicted _CHROMIUM macro

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gl_bindings.h

Issue 715983004: gpu: Change the hex code of conflicted _CHROMIUM macro (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: make build_gles2_cmd_buffer.py check this confliction. Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ui/gl/gl_bindings.h

diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h

index aea47fc77e8bb0830447ca4641de4915aa4fc676..f15cfe39c7f6e604af58f6212fa77c93f2ab0171 100644

--- a/ui/gl/gl_bindings.h

+++ b/ui/gl/gl_bindings.h

@@ -116,17 +116,17 @@

#define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867

// GL_CHROMIUM_command_buffer_query

-#define GL_COMMANDS_ISSUED_CHROMIUM 0x84F2

+#define GL_COMMANDS_ISSUED_CHROMIUM 0x6004

dshwang 2014/11/18 14:33:48 recently 'git cl format' is changed, so the style

no sievers 2014/11/18 19:57:20 nit: I'd use the existing style and ignore 'cl for

/* GL_CHROMIUM_get_error_query */

-#define GL_GET_ERROR_QUERY_CHROMIUM 0x84F3

+#define GL_GET_ERROR_QUERY_CHROMIUM 0x6003

/* GL_CHROMIUM_command_buffer_latency_query */

-#define GL_LATENCY_QUERY_CHROMIUM 0x84F4

+#define GL_LATENCY_QUERY_CHROMIUM 0x6007

/* GL_CHROMIUM_async_pixel_transfers */

-#define GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM 0x84F5

-#define GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM 0x84F6

+#define GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM 0x6005

+#define GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM 0x6006

// GL_CHROMIUM_sync_query

#define GL_COMMANDS_COMPLETED_CHROMIUM 0x84F7

« gpu/command_buffer/build_gles2_cmd_buffer.py ('K') | « gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('k') | no next file » | no next file with comments »