gpu/GLES2/gl2extchromium.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: gpu/GLES2/gl2extchromium.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: run build_gles2_cmd_buffer.py 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

« no previous file with comments | « no previous file | gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h » ('j') | gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/GLES2/gl2extchromium.h

diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h

index a4017ecd96c548c065eafbc47ec122b33f62efa5..4a31361797df4aa972b027ad7f571cc82aaeaa5d 100644

--- a/gpu/GLES2/gl2extchromium.h

+++ b/gpu/GLES2/gl2extchromium.h

@@ -367,10 +367,10 @@ typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERCHROMIUMPROC) (GLint srcX0, GLint

#define GL_CHROMIUM_async_pixel_transfers 1

#ifndef GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM

-#define GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM 0x84F5

+#define GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM 0x84F8

no sievers 2014/11/17 20:11:26 This actually collides with MAX_RECTANGLE_TEXTURE_

#endif

#ifndef GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM

-#define GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM 0x84F6

+#define GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM 0x84F9

#endif

#endif /* GL_CHROMIUM_async_pixel_transfers */