cc/trees/layer_tree_host_impl.cc - 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: cc/trees/layer_tree_host_impl.cc

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: cc/trees/layer_tree_host_impl.cc

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc

index 26ba2ee7f32bab8bf4c4f8af92be58cb7c2dc154..7932132446eae68054fbd20d681a8f079b2be4f2 100644

--- a/cc/trees/layer_tree_host_impl.cc

+++ b/cc/trees/layer_tree_host_impl.cc

@@ -109,14 +109,10 @@ unsigned GetMapImageTextureTarget(cc::ContextProvider* context_provider) {

if (!context_provider)

return GL_TEXTURE_2D;

- // TODO(reveman): Determine if GL_TEXTURE_EXTERNAL_OES works well on

- // Android before we enable this. crbug.com/322780

-#if !defined(OS_ANDROID)

if (context_provider->ContextCapabilities().gpu.egl_image_external)

return GL_TEXTURE_EXTERNAL_OES;

if (context_provider->ContextCapabilities().gpu.texture_rectangle)

return GL_TEXTURE_RECTANGLE_ARB;

-#endif

return GL_TEXTURE_2D;

}

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