Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(367)

Unified Diff: cc/resources/scoped_resource.cc

Issue 21159007: cc: Adding support for RGBA_4444 tile textures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: deprecate GLenum format throughout cc Created 7 years, 3 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/resources/scoped_resource.cc
diff --git a/cc/resources/scoped_resource.cc b/cc/resources/scoped_resource.cc
index 525fb735db5a57a1a49dbcc1d7d082fd3a049dfe..478b82ae7ddfebbddf581f2ae49579b8c745c250 100644
--- a/cc/resources/scoped_resource.cc
+++ b/cc/resources/scoped_resource.cc
@@ -16,14 +16,14 @@ ScopedResource::~ScopedResource() {
}
bool ScopedResource::Allocate(gfx::Size size,
- GLenum format,
- ResourceProvider::TextureUsageHint hint) {
+ ResourceProvider::TextureUsageHint hint,
+ ResourceProvider::TextureFormat texture_format) {
DCHECK(!id());
DCHECK(!size.IsEmpty());
- set_dimensions(size, format);
+ set_dimensions(size, texture_format);
set_id(resource_provider_->CreateResource(
- size, format, GL_CLAMP_TO_EDGE, hint));
+ size, GL_CLAMP_TO_EDGE, hint, texture_format));
#ifndef NDEBUG
allocate_thread_id_ = base::PlatformThread::CurrentId();

Powered by Google App Engine
This is Rietveld 408576698