cc/resources/resource_provider.cc - Issue 1422103003: cc: Remove the ability to specify a GL texture target

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/resources/resource_provider.cc

Issue 1422103003: cc: Remove the ability to specify a GL texture target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« cc/resources/resource_pool.h ('K') | « cc/resources/resource_provider.h ('k') | cc/resources/resource_provider_unittest.cc » ('j') | content/browser/gpu/browser_gpu_memory_buffer_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/resources/resource_provider.cc

diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc

index 8f8490b839b4a1bc5b8843629055ef9247620222..f2b17d3fc06c413f090780063a4197886310f875 100644

--- a/cc/resources/resource_provider.cc

+++ b/cc/resources/resource_provider.cc

@@ -399,12 +399,14 @@ ResourceId ResourceProvider::CreateResource(const gfx::Size& size,

return 0;

}

-ResourceId ResourceProvider::CreateResourceWithTextureTarget(

+ResourceId ResourceProvider::CreateResourceWithImageTextureTarget(

const gfx::Size& size,

- GLenum target,

TextureHint hint,

ResourceFormat format) {

DCHECK(!size.IsEmpty());

+ GLenum target = GetImageTextureTarget(format);

+ if (!target)

+ target = GL_TEXTURE_2D;

switch (default_resource_type_) {

case RESOURCE_TYPE_GL_TEXTURE:

return CreateGLTexture(size,