summaryrefslogtreecommitdiffstats
path: root/cc/stubs
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 23:35:43 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 23:35:43 +0000
commitd9c2852424a372ad67459719c398d9040e2c0111 (patch)
tree68ca65cbcd9c3d791e9eced185c17d8fa4850bb6 /cc/stubs
parentb9deda21a9b74d344d60081688b10fab4ebf0d4b (diff)
downloadchromium_src-d9c2852424a372ad67459719c398d9040e2c0111.zip
chromium_src-d9c2852424a372ad67459719c398d9040e2c0111.tar.gz
chromium_src-d9c2852424a372ad67459719c398d9040e2c0111.tar.bz2
Remove GraphicsContext3D:: stubs from cc
cc needs GL enum values. In WebKit, these came from GraphicsContext3D::, Extensions3D::, Extensions3DChromium and types came from GraphicsTypes3D. In chromium, we juse use the GL headers for this. BUG=144577 Review URL: https://chromiumcodereview.appspot.com/11111005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/stubs')
-rw-r--r--cc/stubs/Extensions3D.h6
-rw-r--r--cc/stubs/Extensions3DChromium.h6
-rw-r--r--cc/stubs/GraphicsContext3D.h6
-rw-r--r--cc/stubs/GraphicsTypes3D.h6
-rw-r--r--cc/stubs/extensions_3d.h25
-rw-r--r--cc/stubs/extensions_3d_chromium.h54
-rw-r--r--cc/stubs/graphics_context_3d.h74
-rw-r--r--cc/stubs/graphics_types_3d.h18
8 files changed, 0 insertions, 195 deletions
diff --git a/cc/stubs/Extensions3D.h b/cc/stubs/Extensions3D.h
deleted file mode 100644
index 77f010e..0000000
--- a/cc/stubs/Extensions3D.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/stubs/extensions_3d.h"
diff --git a/cc/stubs/Extensions3DChromium.h b/cc/stubs/Extensions3DChromium.h
deleted file mode 100644
index f3c6fa9..0000000
--- a/cc/stubs/Extensions3DChromium.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/stubs/extensions_3d_chromium.h"
diff --git a/cc/stubs/GraphicsContext3D.h b/cc/stubs/GraphicsContext3D.h
deleted file mode 100644
index 3460a30..0000000
--- a/cc/stubs/GraphicsContext3D.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/stubs/graphics_context_3d.h"
diff --git a/cc/stubs/GraphicsTypes3D.h b/cc/stubs/GraphicsTypes3D.h
deleted file mode 100644
index 8d08bb3..0000000
--- a/cc/stubs/GraphicsTypes3D.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/stubs/graphics_types_3d.h"
diff --git a/cc/stubs/extensions_3d.h b/cc/stubs/extensions_3d.h
deleted file mode 100644
index bbeb9e6..0000000
--- a/cc/stubs/extensions_3d.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CC_STUBS_EXTENSIONS3D_H_
-#define CC_STUBS_EXTENSIONS3D_H_
-
-#include "third_party/khronos/GLES2/gl2.h"
-#include "third_party/khronos/GLES2/gl2ext.h"
-
-namespace cc {
-
-class Extensions3D {
-public:
- enum {
- TEXTURE_RECTANGLE_ARB = GL_TEXTURE_RECTANGLE_ARB,
- BGRA_EXT = GL_BGRA_EXT,
- RGBA8_OES = GL_RGBA8_OES,
- };
-};
-
-}
-
-
-#endif // CC_STUBS_EXTENSIONS3D_H_
diff --git a/cc/stubs/extensions_3d_chromium.h b/cc/stubs/extensions_3d_chromium.h
deleted file mode 100644
index f5d36d2..0000000
--- a/cc/stubs/extensions_3d_chromium.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CC_STUBS_EXTENSIONS3DCHROMIUM_H_
-#define CC_STUBS_EXTENSIONS3DCHROMIUM_H_
-
-#include "Extensions3D.h"
-
-// These enum names collides with gl2ext.h, so we just redefine them.
-#ifdef GL_TEXTURE_EXTERNAL_OES
-#undef GL_TEXTURE_EXTERNAL_OES
-#endif
-#ifdef GL_TEXTURE_USAGE_ANGLE
-#undef GL_TEXTURE_USAGE_ANGLE
-#endif
-#ifdef GL_FRAMEBUFFER_ATTACHMENT_ANGLE
-#undef GL_FRAMEBUFFER_ATTACHMENT_ANGLE
-#endif
-
-namespace cc {
-
-class Extensions3DChromium {
-public:
- enum {
- // GL_OES_EGL_image_external
- GL_TEXTURE_EXTERNAL_OES = 0x8D65,
-
- // GL_CHROMIUM_map_sub (enums inherited from GL_ARB_vertex_buffer_object)
- READ_ONLY = 0x88B8,
- WRITE_ONLY = 0x88B9,
-
- // GL_ANGLE_texture_usage
- GL_TEXTURE_USAGE_ANGLE = 0x93A2,
- GL_FRAMEBUFFER_ATTACHMENT_ANGLE = 0x93A3,
-
- // GL_EXT_texture_storage
- BGRA8_EXT = 0x93A1,
-
- // GL_EXT_occlusion_query_boolean
- ANY_SAMPLES_PASSED_EXT = 0x8C2F,
- ANY_SAMPLES_PASSED_CONSERVATIVE_EXT = 0x8D6A,
- CURRENT_QUERY_EXT = 0x8865,
- QUERY_RESULT_EXT = 0x8866,
- QUERY_RESULT_AVAILABLE_EXT = 0x8867,
-
- // GL_CHROMIUM_command_buffer_query
- COMMANDS_ISSUED_CHROMIUM = 0x84F2
- };
-};
-
-}
-
-#endif // CC_STUBS_EXTENSIONS3DCHROMIUM_H_
diff --git a/cc/stubs/graphics_context_3d.h b/cc/stubs/graphics_context_3d.h
deleted file mode 100644
index e7f7a60..0000000
--- a/cc/stubs/graphics_context_3d.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CC_STUBS_GRAPHICSCONTEXT3D_H_
-#define CC_STUBS_GRAPHICSCONTEXT3D_H_
-
-#include "GraphicsTypes3D.h"
-#include "IntSize.h"
-#include "third_party/khronos/GLES2/gl2.h"
-
-#ifdef NO_ERROR
-#undef NO_ERROR
-#endif
-
-namespace cc {
-
-class GraphicsContext3D {
-public:
- enum SourceDataFormat { SourceFormatRGBA8, SourceFormatBGRA8 };
- static bool computeFormatAndTypeParameters(unsigned, unsigned, unsigned* componentsPerPixel, unsigned* bytesPerComponent);
-
- enum {
- ARRAY_BUFFER = GL_ARRAY_BUFFER,
- BLEND = GL_BLEND,
- CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
- COLOR_ATTACHMENT0 = GL_COLOR_ATTACHMENT0,
- COLOR_BUFFER_BIT = GL_COLOR_BUFFER_BIT,
- COMPILE_STATUS = GL_COMPILE_STATUS,
- CULL_FACE = GL_CULL_FACE,
- DEPTH_TEST = GL_DEPTH_TEST,
- ELEMENT_ARRAY_BUFFER = GL_ELEMENT_ARRAY_BUFFER,
- EXTENSIONS = GL_EXTENSIONS,
- FLOAT = GL_FLOAT,
- FRAGMENT_SHADER = GL_FRAGMENT_SHADER,
- FRAMEBUFFER_COMPLETE = GL_FRAMEBUFFER_COMPLETE,
- FRAMEBUFFER = GL_FRAMEBUFFER,
- INVALID_ENUM = GL_INVALID_ENUM,
- INVALID_VALUE = GL_INVALID_VALUE,
- LINEAR = GL_LINEAR,
- LINE_LOOP = GL_LINE_LOOP ,
- LINK_STATUS = GL_LINK_STATUS,
- LUMINANCE = GL_LUMINANCE,
- MAX_TEXTURE_SIZE = GL_MAX_TEXTURE_SIZE,
- NEAREST = GL_NEAREST,
- NO_ERROR = GL_NO_ERROR,
- ONE = GL_ONE,
- ONE_MINUS_SRC_ALPHA = GL_ONE_MINUS_SRC_ALPHA,
- RGBA = GL_RGBA,
- RGB = GL_RGB,
- SCISSOR_TEST = GL_SCISSOR_TEST,
- SRC_ALPHA = GL_SRC_ALPHA,
- STATIC_DRAW = GL_STATIC_DRAW,
- TEXTURE0 = GL_TEXTURE0,
- TEXTURE1 = GL_TEXTURE1,
- TEXTURE_2D = GL_TEXTURE_2D,
- TEXTURE2 = GL_TEXTURE2,
- TEXTURE3 = GL_TEXTURE3,
- TEXTURE_MAG_FILTER = GL_TEXTURE_MAG_FILTER,
- TEXTURE_MIN_FILTER = GL_TEXTURE_MIN_FILTER,
- TEXTURE_WRAP_S = GL_TEXTURE_WRAP_S,
- TEXTURE_WRAP_T = GL_TEXTURE_WRAP_T,
- TRIANGLES = GL_TRIANGLES,
- TRIANGLE_FAN = GL_TRIANGLE_FAN,
- UNSIGNED_BYTE = GL_UNSIGNED_BYTE,
- UNSIGNED_SHORT = GL_UNSIGNED_SHORT,
- VERTEX_SHADER = GL_VERTEX_SHADER,
- ZERO = GL_ZERO,
- };
-};
-
-}
-
-#endif // CC_STUBS_GRAPHICSCONTEXT3D_H_
diff --git a/cc/stubs/graphics_types_3d.h b/cc/stubs/graphics_types_3d.h
deleted file mode 100644
index a01414e..0000000
--- a/cc/stubs/graphics_types_3d.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CC_STUBS_GRAPHICSTYPES3D_H_
-#define CC_STUBS_GRAPHICSTYPES3D_H_
-
-#define NullPlatform3DObject 0
-
-typedef unsigned char GC3Dboolean;
-typedef unsigned GC3Denum;
-typedef unsigned GC3Duint;
-typedef unsigned Platform3DObject;
-typedef int GC3Dint;
-typedef signed char GC3Dbyte;
-
-#endif // CC_STUBS_GRAPHICSTYPES3D_H_
-