ui/gl/gl_gl_api_implementation.cc - Issue 895853003: Update from https://crrev.com/314320

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_gl_api_implementation.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 11 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:

Index: ui/gl/gl_gl_api_implementation.cc

diff --git a/ui/gl/gl_gl_api_implementation.cc b/ui/gl/gl_gl_api_implementation.cc

index 3b8c534ec3d4b192dcfb6de1a3ededdecbbaf4c5..fada5e3707c328e230067171d9b1882f0712f872 100644

--- a/ui/gl/gl_gl_api_implementation.cc

+++ b/ui/gl/gl_gl_api_implementation.cc

@@ -85,7 +85,7 @@ static inline GLenum GetTexInternalFormat(GLenum internal_format,

}

if (type == GL_FLOAT && gfx::g_version_info->is_angle &&

- gfx::g_version_info->is_es2) {

+ gfx::g_version_info->is_es && gfx::g_version_info->major_version == 2) {

// It's possible that the texture is using a sized internal format, and

// ANGLE exposing GLES2 API doesn't support those.

// TODO(oetuaho@nvidia.com): Remove these conversions once ANGLE has the

« no previous file with comments | « ui/gl/gl_egl_api_implementation.cc ('k') | ui/gl/gl_glx_api_implementation.h » ('j') | no next file with comments »