Issue 16818021: Changed typedefs for GLintptr and GLsizeiptr (and ARB variants) to work around conflicts with Skia'…

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

Issue 16818021: Changed typedefs for GLintptr and GLsizeiptr (and ARB variants) to work around conflicts with Skia'… (Closed)

Created:
7 years, 6 months ago by Ken Russell (switch to Gerrit)

Modified:
7 years, 6 months ago

Reviewers:
marcheu

CC:
chromium-reviews, Stephen White, Myles C. Maxfield (Amazon.com), bsalomon_chromium

Base URL:
svn://svn.chromium.org/chrome/trunk/deps/

Visibility:
Public.

More Reviews

Description

Changed typedefs for GLintptr and GLsizeiptr (and ARB variants) to work around conflicts with Skia's typedefs in src/third_party/skia/include/gpu/gl/GrGLFunctions.h . There is a fundamental conflict between the OpenGL and OpenGL ES headers for these typedefs. Without this modification, src/ui/gl/gl_bindings_skia_in_process.cc fails to compile. This patch is not appropriate to upstream to Mesa. Additionally, there may be a different workaround available which would allow this patch to be reverted. BUG=238755 TBR=marcheu@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=206312

Patch Set 1 #

Created: 7 years, 6 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+4 lines, -4 lines)			Patch
	M	third_party/mesa/include/GL/glext.h	View		1 chunk	+4 lines, -4 lines	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

Ken Russell (switch to Gerrit)

FYI. Upon further reflection I think this could be worked around differently by changing the ...

7 years, 6 months ago (2013-06-14 05:56:22 UTC) #1

Ken Russell (switch to Gerrit)

7 years, 6 months ago (2013-06-14 05:56:53 UTC) #2

Message was sent while issue was closed.

Committed patchset #1 manually as r206312 (presubmit successful).

Expand Messages | Collapse Messages