content/common/gpu/gpu_channel_manager.cc - Issue 98643013: Take GL version and extensions correctly into account when binding functions

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: content/common/gpu/gpu_channel_manager.cc

Issue 98643013: Take GL version and extensions correctly into account when binding functions (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Accommodated changes in content tests Created 6 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/compositor/software_output_device_ozone_unittest.cc ('k') | content/common/gpu/media/rendering_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_channel_manager.cc

diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc

index 8b466bd0b2b8fd5ad1f70adfba50afea3910217c..e8c1f2f390734b450ac6bb3c2c5d40513bc76f7b 100644

--- a/content/common/gpu/gpu_channel_manager.cc

+++ b/content/common/gpu/gpu_channel_manager.cc

@@ -58,8 +58,8 @@ GpuChannelManager::~GpuChannelManager() {

gpu::gles2::ProgramCache* GpuChannelManager::program_cache() {

if (!program_cache_.get() &&

- (gfx::g_driver_gl.ext.b_ARB_get_program_binary ||

- gfx::g_driver_gl.ext.b_OES_get_program_binary) &&

+ (gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary ||

+ gfx::g_driver_gl.ext.b_GL_OES_get_program_binary) &&

!CommandLine::ForCurrentProcess()->HasSwitch(

switches::kDisableGpuProgramCache)) {

program_cache_.reset(new gpu::gles2::MemoryProgramCache());