ui/gl/gl_image_shm.h - Issue 198703002: Add GL_TEXTURE_EXTERNAL_OES as supported texture target for CHROMIUM_map_image.

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_image_shm.h

Issue 198703002: Add GL_TEXTURE_EXTERNAL_OES as supported texture target for CHROMIUM_map_image. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mac build break Created 6 years, 9 months 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_image_shm.h

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

index fea9d33df5713669eeac0ca8a2f8114b7a675a20..0aee2cbd68dcd8316d8eae078db629b745f3ab95 100644

--- a/ui/gl/gl_image_shm.h

+++ b/ui/gl/gl_image_shm.h

@@ -6,6 +6,7 @@

#define UI_GL_GL_IMAGE_SHM_H_

#include "base/memory/scoped_ptr.h"

+#include "ui/gl/gl_bindings.h"

#include "ui/gl/gl_image.h"

namespace gfx {

@@ -33,6 +34,11 @@ class GL_EXPORT GLImageShm : public GLImage {

scoped_ptr<base::SharedMemory> shared_memory_;

gfx::Size size_;

unsigned internalformat_;

+#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \

+ defined(USE_OZONE)

+ GLuint egl_texture_id_;

+ EGLImageKHR egl_image_;

+#endif

DISALLOW_COPY_AND_ASSIGN(GLImageShm);

};

« no previous file with comments | « ui/gl/gl_image_egl.cc ('k') | ui/gl/gl_image_shm.cc » ('j') | no next file with comments »