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

Unified Diff: cc/platform_color.h

Issue 11111005: Remove GraphicsContext3D:: stubs from cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again 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/layer_tree_host_unittest.cc ('k') | cc/prioritized_texture.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/platform_color.h
diff --git a/cc/platform_color.h b/cc/platform_color.h
index a3f3f354d670f9d31e729cc8b3bc870698ee8371..54a305c76d8b03762d13cd1c10e306b95a722e58 100644
--- a/cc/platform_color.h
+++ b/cc/platform_color.h
@@ -5,8 +5,8 @@
#ifndef PlatformColor_h
#define PlatformColor_h
-#include "Extensions3D.h"
-#include "GraphicsContext3D.h"
+#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
#include "third_party/skia/include/core/SkTypes.h"
#include <public/WebGraphicsContext3D.h>
@@ -14,21 +14,23 @@ namespace cc {
class PlatformColor {
public:
- static GraphicsContext3D::SourceDataFormat format()
+ enum SourceDataFormat { SourceFormatRGBA8, SourceFormatBGRA8 };
+
+ static SourceDataFormat format()
{
- return SK_B32_SHIFT ? GraphicsContext3D::SourceFormatRGBA8 : GraphicsContext3D::SourceFormatBGRA8;
+ return SK_B32_SHIFT ? SourceFormatRGBA8 : SourceFormatBGRA8;
}
// Returns the most efficient texture format for this platform.
- static GC3Denum bestTextureFormat(WebKit::WebGraphicsContext3D* context, bool supportsBGRA8888)
+ static GLenum bestTextureFormat(WebKit::WebGraphicsContext3D* context, bool supportsBGRA8888)
{
- GC3Denum textureFormat = GraphicsContext3D::RGBA;
+ GLenum textureFormat = GL_RGBA;
switch (format()) {
- case GraphicsContext3D::SourceFormatRGBA8:
+ case SourceFormatRGBA8:
break;
- case GraphicsContext3D::SourceFormatBGRA8:
+ case SourceFormatBGRA8:
if (supportsBGRA8888)
- textureFormat = Extensions3D::BGRA_EXT;
+ textureFormat = GL_BGRA_EXT;
break;
default:
NOTREACHED();
@@ -39,13 +41,13 @@ public:
// Return true if the given texture format has the same component order
// as the color on this platform.
- static bool sameComponentOrder(GC3Denum textureFormat)
+ static bool sameComponentOrder(GLenum textureFormat)
{
switch (format()) {
- case GraphicsContext3D::SourceFormatRGBA8:
- return textureFormat == GraphicsContext3D::RGBA;
- case GraphicsContext3D::SourceFormatBGRA8:
- return textureFormat == Extensions3D::BGRA_EXT;
+ case SourceFormatRGBA8:
+ return textureFormat == GL_RGBA;
+ case SourceFormatBGRA8:
+ return textureFormat == GL_BGRA_EXT;
default:
NOTREACHED();
return false;
« no previous file with comments | « cc/layer_tree_host_unittest.cc ('k') | cc/prioritized_texture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698