summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 01:51:56 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 01:51:56 +0000
commit6c8bbcb719653d761d688d3a47d85a8451e498e4 (patch)
treecff6e72065c7056d849a8cc346ee74d01801a24e
parent8f51a1c8674ecb5c5e8a0499e41b587c82f73334 (diff)
downloadchromium_src-6c8bbcb719653d761d688d3a47d85a8451e498e4.zip
chromium_src-6c8bbcb719653d761d688d3a47d85a8451e498e4.tar.gz
chromium_src-6c8bbcb719653d761d688d3a47d85a8451e498e4.tar.bz2
Removed old code related to unimplemented GL_CHROMIUM_copy_texture_to_parent_texture and GL_CHROMIUM_latch.
Not sure how I missed these first time around... Review URL: http://codereview.chromium.org/8481014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109164 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/GLES2/gl2ext.h34
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.cc8
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.h3
3 files changed, 0 insertions, 45 deletions
diff --git a/gpu/GLES2/gl2ext.h b/gpu/GLES2/gl2ext.h
index e5b46b1..71a3df0 100644
--- a/gpu/GLES2/gl2ext.h
+++ b/gpu/GLES2/gl2ext.h
@@ -1233,19 +1233,6 @@ typedef void* (GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2DCHROMIUM) (GLenum target, GLint
typedef void (GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2DCHROMIUM) (const void* mem);
#endif
-/* GL_CHROMIUM_copy_texture_to_parent_texture */
-#ifndef GL_CHROMIUM_copy_texture_to_parent_texture
-#define GL_CHROMIUM_copy_texture_to_parent_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-#define glCopyTextureToParentTextureCHROMIUM GLES2_GET_FUN(CopyTextureToParentTextureCHROMIUM)
-#if !defined(GLES2_USE_CPP_BINDINGS)
-GL_APICALL void GL_APIENTRY glCopyTextureToParentTextureCHROMIUM (GLuint id, GLuint id2);
-#endif
-#else
-typedef void (GL_APIENTRYP PFNGLCOPYTEXTURETOPARENTTEXTURECHROMIUM) (GLuint id, GLuint id2);
-#endif
-#endif
-
/* GL_CHROMIUM_resize */
#ifndef GL_CHROMIUM_resize
#define GL_CHROMIUM_resize 1
@@ -1287,27 +1274,6 @@ typedef void (GL_APIENTRYP PFNGLREQUESTEXTENSIONCHROMIUM) (const GLchar *extensi
#endif
#endif
-/* GL_CHROMIUM_latch */
-/*
- * This extension is similar in spirit to GL_NV_fence except
- * that GL_CHROMIUM_latch does not require resources to be shared
- * and it does not require glFlush semantics to work.
- */
-#ifndef GL_CHROMIUM_latch
-#define GL_CHROMIUM_latch 1
-#ifdef GL_GLEXT_PROTOTYPES
-#define glSetLatchCHROMIUM GLES2_GET_FUN(SetLatchCHROMIUM)
-#define glWaitLatchCHROMIUM GLES2_GET_FUN(WaitLatchCHROMIUM)
-#if !defined(GLES2_USE_CPP_BINDINGS)
-GL_APICALL void GL_APIENTRY glSetLatchCHROMIUM (GLuint latch_id);
-GL_APICALL void GL_APIENTRY glWaitLatchCHROMIUM (GLuint latch_id);
-#endif
-#else
-typedef void (GL_APIENTRYP PFNGLSETLATCHCHROMIUM) (GLuint latch_id);
-typedef void (GL_APIENTRYP PFNGLWaitLATCHCHROMIUM) (GLuint latch_id);
-#endif
-#endif
-
/* GL_CHROMIUM_rate_limit_offscreen_context */
/*
* This extension will block if the calling context has gotten more than two
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
index e76f9da..7723305 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
@@ -62,7 +62,6 @@ WebGraphicsContext3DInProcessImpl::WebGraphicsContext3DInProcessImpl(
multisample_color_buffer_(0),
bound_fbo_(0),
bound_texture_(0),
- copy_texture_to_parent_texture_fbo_(0),
#ifdef FLIP_FRAMEBUFFER_VERTICALLY
scanline_(0),
#endif
@@ -88,7 +87,6 @@ WebGraphicsContext3DInProcessImpl::~WebGraphicsContext3DInProcessImpl() {
glDeleteRenderbuffersEXT(1, &depth_stencil_buffer_);
}
glDeleteTextures(1, &texture_);
- glDeleteFramebuffersEXT(1, &copy_texture_to_parent_texture_fbo_);
#ifdef FLIP_FRAMEBUFFER_VERTICALLY
if (scanline_)
delete[] scanline_;
@@ -234,8 +232,6 @@ bool WebGraphicsContext3DInProcessImpl::initialize(
return false;
}
- glGenFramebuffersEXT(1, &copy_texture_to_parent_texture_fbo_);
-
initialized_ = true;
gl_context_->ReleaseCurrent(gl_surface_.get());
return true;
@@ -1254,10 +1250,6 @@ WebString WebGraphicsContext3DInProcessImpl::getString(WGC3Denum name) {
// extension that are a subset of it.
result += " GL_EXT_texture_format_BGRA8888 GL_EXT_read_format_bgra";
}
- // GL_CHROMIUM_copy_texture_to_parent_texture requires the
- // desktopGL-only function glGetTexLevelParameteriv (GLES2
- // doesn't support it).
- result += " GL_CHROMIUM_copy_texture_to_parent_texture";
}
}
return WebString::fromUTF8(result.c_str());
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
index 013fc08..0817e4a 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
@@ -479,9 +479,6 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D {
// For tracking which texture is bound
WebGLId bound_texture_;
- // FBO used for copying child texture to parent texture.
- WebGLId copy_texture_to_parent_texture_fbo_;
-
#ifdef FLIP_FRAMEBUFFER_VERTICALLY
unsigned char* scanline_;
#endif