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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resource_provider.cc

Issue 11150025: Patch from https://codereview.chromium.org/11111005/ without actual file deletes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « cc/resource_provider.h ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_provider.cc
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index ff917b0227ed20ccad7408b25d7d6373cc052fd2..d1c341af8a044e99d5109c9ea904712fbd84054e 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -16,9 +16,10 @@
#include "base/stl_util.h"
#include "base/string_split.h"
#include "base/string_util.h"
+#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
#include "CCProxy.h"
#include "CCRendererGL.h" // For the GLC() macro.
-#include "Extensions3DChromium.h"
#include "IntRect.h"
#include "LayerTextureSubImage.h"
#include "ThrottledTextureUploader.h"
@@ -29,14 +30,14 @@ using WebKit::WebGraphicsContext3D;
namespace cc {
-static GC3Denum textureToStorageFormat(GC3Denum textureFormat)
+static GLenum textureToStorageFormat(GLenum textureFormat)
{
- GC3Denum storageFormat = Extensions3D::RGBA8_OES;
+ GLenum storageFormat = GL_RGBA8_OES;
switch (textureFormat) {
- case GraphicsContext3D::RGBA:
+ case GL_RGBA:
break;
- case Extensions3D::BGRA_EXT:
- storageFormat = Extensions3DChromium::BGRA8_EXT;
+ case GL_BGRA_EXT:
+ storageFormat = GL_BGRA8_EXT;
break;
default:
ASSERT_NOT_REACHED();
@@ -46,9 +47,9 @@ static GC3Denum textureToStorageFormat(GC3Denum textureFormat)
return storageFormat;
}
-static bool isTextureFormatSupportedForStorage(GC3Denum format)
+static bool isTextureFormatSupportedForStorage(GLenum format)
{
- return (format == GraphicsContext3D::RGBA || format == Extensions3D::BGRA_EXT);
+ return (format == GL_RGBA || format == GL_BGRA_EXT);
}
CCResourceProvider::TransferableResourceList::TransferableResourceList()
@@ -74,7 +75,7 @@ CCResourceProvider::Resource::Resource()
{
}
-CCResourceProvider::Resource::Resource(unsigned textureId, int pool, const IntSize& size, GC3Denum format)
+CCResourceProvider::Resource::Resource(unsigned textureId, int pool, const IntSize& size, GLenum format)
: glId(textureId)
, pixels(0)
, pool(pool)
@@ -89,7 +90,7 @@ CCResourceProvider::Resource::Resource(unsigned textureId, int pool, const IntSi
{
}
-CCResourceProvider::Resource::Resource(uint8_t* pixels, int pool, const IntSize& size, GC3Denum format)
+CCResourceProvider::Resource::Resource(uint8_t* pixels, int pool, const IntSize& size, GLenum format)
: glId(0)
, pixels(pixels)
, pool(pool)
@@ -148,13 +149,13 @@ bool CCResourceProvider::inUseByConsumer(ResourceId id)
return !!resource->lockForReadCount || resource->exported;
}
-CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
+CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, const IntSize& size, GLenum format, TextureUsageHint hint)
{
switch (m_defaultResourceType) {
case GLTexture:
return createGLTexture(pool, size, format, hint);
case Bitmap:
- ASSERT(format == GraphicsContext3D::RGBA);
+ ASSERT(format == GL_RGBA);
return createBitmap(pool, size);
}
@@ -162,26 +163,26 @@ CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, cons
return 0;
}
-CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
+CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, const IntSize& size, GLenum format, TextureUsageHint hint)
{
ASSERT(CCProxy::isImplThread());
unsigned textureId = 0;
WebGraphicsContext3D* context3d = m_context->context3D();
ASSERT(context3d);
GLC(context3d, textureId = context3d->createTexture());
- GLC(context3d, context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, textureId));
- GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
- GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
- GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE));
- GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE));
+ GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId));
+ GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+ GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+ GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
+ GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
if (m_useTextureUsageHint && hint == TextureUsageFramebuffer)
- GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, Extensions3DChromium::GL_TEXTURE_USAGE_ANGLE, Extensions3DChromium::GL_FRAMEBUFFER_ATTACHMENT_ANGLE));
+ GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_USAGE_ANGLE, GL_FRAMEBUFFER_ATTACHMENT_ANGLE));
if (m_useTextureStorageExt && isTextureFormatSupportedForStorage(format)) {
- GC3Denum storageFormat = textureToStorageFormat(format);
- GLC(context3d, context3d->texStorage2DEXT(GraphicsContext3D::TEXTURE_2D, 1, storageFormat, size.width(), size.height()));
+ GLenum storageFormat = textureToStorageFormat(format);
+ GLC(context3d, context3d->texStorage2DEXT(GL_TEXTURE_2D, 1, storageFormat, size.width(), size.height()));
} else
- GLC(context3d, context3d->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, format, size.width(), size.height(), 0, format, GraphicsContext3D::UNSIGNED_BYTE, 0));
+ GLC(context3d, context3d->texImage2D(GL_TEXTURE_2D, 0, format, size.width(), size.height(), 0, format, GL_UNSIGNED_BYTE, 0));
ResourceId id = m_nextId++;
Resource resource(textureId, pool, size, format);
m_resources.add(id, resource);
@@ -195,7 +196,7 @@ CCResourceProvider::ResourceId CCResourceProvider::createBitmap(int pool, const
uint8_t* pixels = new uint8_t[size.width() * size.height() * 4];
ResourceId id = m_nextId++;
- Resource resource(pixels, pool, size, GraphicsContext3D::RGBA);
+ Resource resource(pixels, pool, size, GL_RGBA);
m_resources.add(id, resource);
return id;
}
@@ -298,7 +299,7 @@ void CCResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRe
WebGraphicsContext3D* context3d = m_context->context3D();
ASSERT(context3d);
ASSERT(m_texSubImage.get());
- context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, resource->glId);
+ context3d->bindTexture(GL_TEXTURE_2D, resource->glId);
m_texSubImage->upload(image, imageRect, sourceRect, destOffset, resource->format, context3d);
}
@@ -431,7 +432,7 @@ CCResourceProvider::ScopedWriteLockGL::~ScopedWriteLockGL()
void CCResourceProvider::populateSkBitmapWithResource(SkBitmap* skBitmap, const Resource* resource)
{
ASSERT(resource->pixels);
- ASSERT(resource->format == GraphicsContext3D::RGBA);
+ ASSERT(resource->format == GL_RGBA);
skBitmap->setConfig(SkBitmap::kARGB_8888_Config, resource->size.width(), resource->size.height());
skBitmap->setPixels(resource->pixels);
}
@@ -485,7 +486,7 @@ bool CCResourceProvider::initialize()
if (!context3d->makeContextCurrent())
return false;
- std::string extensionsString = UTF16ToASCII(context3d->getString(GraphicsContext3D::EXTENSIONS));
+ std::string extensionsString = UTF16ToASCII(context3d->getString(GL_EXTENSIONS));
std::vector<std::string> extensions;
base::SplitString(extensionsString, ' ', &extensions);
bool useMapSub = false;
@@ -507,7 +508,7 @@ bool CCResourceProvider::initialize()
m_textureCopier = AcceleratedTextureCopier::create(context3d, useBindUniform);
m_textureUploader = ThrottledTextureUploader::create(context3d);
- GLC(context3d, context3d->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_maxTextureSize));
+ GLC(context3d, context3d->getIntegerv(GL_MAX_TEXTURE_SIZE, &m_maxTextureSize));
return true;
}
@@ -628,8 +629,8 @@ void CCResourceProvider::receiveFromChild(int child, const TransferableResourceL
for (Vector<TransferableResource>::const_iterator it = resources.resources.begin(); it != resources.resources.end(); ++it) {
unsigned textureId;
GLC(context3d, textureId = context3d->createTexture());
- GLC(context3d, context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, textureId));
- GLC(context3d, context3d->consumeTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, it->mailbox.name));
+ GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId));
+ GLC(context3d, context3d->consumeTextureCHROMIUM(GL_TEXTURE_2D, it->mailbox.name));
ResourceId id = m_nextId++;
Resource resource(textureId, childInfo.pool, it->size, it->format);
m_resources.add(id, resource);
@@ -659,8 +660,8 @@ void CCResourceProvider::receiveFromParent(const TransferableResourceList& resou
#endif
ASSERT(resource->exported);
resource->exported = false;
- GLC(context3d, context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, resource->glId));
- GLC(context3d, context3d->consumeTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, it->mailbox.name));
+ GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->glId));
+ GLC(context3d, context3d->consumeTextureCHROMIUM(GL_TEXTURE_2D, it->mailbox.name));
m_mailboxes.append(it->mailbox);
if (resource->markedForDeletion)
deleteResourceInternal(mapIterator);
@@ -689,8 +690,8 @@ bool CCResourceProvider::transferResource(WebGraphicsContext3D* context, Resourc
resource->mailbox = m_mailboxes.takeFirst();
else
GLC(context, context->genMailboxCHROMIUM(resource->mailbox.name));
- GLC(context, context->bindTexture(GraphicsContext3D::TEXTURE_2D, source->glId));
- GLC(context, context->produceTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, resource->mailbox.name));
+ GLC(context, context->bindTexture(GL_TEXTURE_2D, source->glId));
+ GLC(context, context->produceTextureCHROMIUM(GL_TEXTURE_2D, resource->mailbox.name));
return true;
}
« no previous file with comments | « cc/resource_provider.h ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698