From 68513a70bcd92384395513322f1b801e7bf9c729 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 29 Sep 2010 17:32:26 +0100 Subject: Merge WebKit at r67908: Initial merge by Git Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972 --- WebKit/chromium/public/WebGraphicsContext3D.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'WebKit/chromium/public/WebGraphicsContext3D.h') diff --git a/WebKit/chromium/public/WebGraphicsContext3D.h b/WebKit/chromium/public/WebGraphicsContext3D.h index 44a0498..9857174 100644 --- a/WebKit/chromium/public/WebGraphicsContext3D.h +++ b/WebKit/chromium/public/WebGraphicsContext3D.h @@ -83,6 +83,11 @@ public: // Initializes the graphics context; should be the first operation performed // on newly-constructed instances. Returns true on success. + virtual bool initialize(Attributes, WebView*, bool renderDirectlyToWebView) = 0; + + // Initializes the graphics context; should be the first operation performed + // on newly-constructed instances. Returns true on success. + // FIXME: remove this entry point once the compositor is switched to use GraphicsContext3D. virtual bool initialize(Attributes, WebView*) = 0; // Makes the OpenGL context current on the current thread. Returns true on @@ -134,8 +139,20 @@ public: // getError in the order they were added. virtual void synthesizeGLError(unsigned long error) = 0; + // EXT_texture_format_BGRA8888 virtual bool supportsBGRA() = 0; + // GL_CHROMIUM_map_sub + virtual bool supportsMapSubCHROMIUM() = 0; + virtual void* mapBufferSubDataCHROMIUM(unsigned target, int offset, int size, unsigned access) = 0; + virtual void unmapBufferSubDataCHROMIUM(const void*) = 0; + virtual void* mapTexSubImage2DCHROMIUM(unsigned target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type, unsigned access) = 0; + virtual void unmapTexSubImage2DCHROMIUM(const void*) = 0; + + // GL_CHROMIUM_copy_texture_to_parent_texture + virtual bool supportsCopyTextureToParentTextureCHROMIUM() = 0; + virtual void copyTextureToParentTextureCHROMIUM(unsigned texture, unsigned parentTexture) = 0; + // The entry points below map directly to the OpenGL ES 2.0 API. // See: http://www.khronos.org/registry/gles/ // and: http://www.khronos.org/opengles/sdk/docs/man/ -- cgit v1.1