Skip to content

Commit

Permalink
Removed old code related to unimplemented GL_CHROMIUM_copy_texture_to…
Browse files Browse the repository at this point in the history
…_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
  • Loading branch information
apatrick@chromium.org committed Nov 9, 2011
1 parent 8f51a1c commit 6c8bbcb
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 45 deletions.
34 changes: 0 additions & 34 deletions gpu/GLES2/gl2ext.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions webkit/gpu/webgraphicscontext3d_in_process_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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_;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
3 changes: 0 additions & 3 deletions webkit/gpu/webgraphicscontext3d_in_process_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6c8bbcb

Please sign in to comment.