ui/gl/test/gl_image_test_template.h - Issue 2170293002: Use GLVersionInfo instead of gl::GetGLImplementation() to decide GL paths

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/test/gl_image_test_template.h

Issue 2170293002: Use GLVersionInfo instead of gl::GetGLImplementation() to decide GL paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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/test/gl_image_test_template.h

diff --git a/ui/gl/test/gl_image_test_template.h b/ui/gl/test/gl_image_test_template.h

index 3cf11781697704d27196ed85a7359177947c4061..fe333fa1997ca1a6f76f6c99144014c7ebbdfbb5 100644

--- a/ui/gl/test/gl_image_test_template.h

+++ b/ui/gl/test/gl_image_test_template.h

@@ -22,8 +22,8 @@

#include "ui/gl/gl_context.h"

#include "ui/gl/gl_helper.h"

#include "ui/gl/gl_image.h"

-#include "ui/gl/gl_implementation.h"

#include "ui/gl/gl_surface.h"

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

#include "ui/gl/init/gl_factory.h"

#include "ui/gl/test/gl_image_test_support.h"

#include "ui/gl/test/gl_test_helper.h"

@@ -51,7 +51,7 @@ GLuint LoadFragmentShader(unsigned target, const gfx::Size& size) {

);

// clang-format on

- bool is_gles = GetGLImplementation() == kGLImplementationEGLGLES2;

+ bool is_gles = GLContext::GetCurrent()->GetVersionInfo()->is_es;

switch (target) {

case GL_TEXTURE_2D:

return GLHelper::LoadShader(

« gpu/command_buffer/service/buffer_manager.cc ('K') | « ui/gl/gl_gl_api_implementation.cc ('k') | ui/gl/yuv_to_rgb_converter.h » ('j') | no next file with comments »