Commit e6c8843c authored by alexst@chromium.org's avatar alexst@chromium.org

Cleanup change to the createImageCHROMIUM api to follow up...

Cleanup change to the createImageCHROMIUM api to follow up https://codereview.chromium.org/255713008/

BUG=

Review URL: https://codereview.chromium.org/278453002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269574 0039d316-1c4b-4281-b951-d872f2087c98
parent dbae95e3
...@@ -1344,14 +1344,6 @@ DELEGATE_TO_GL_4R(createImageCHROMIUM, ...@@ -1344,14 +1344,6 @@ DELEGATE_TO_GL_4R(createImageCHROMIUM,
WGC3Denum, WGC3Denum,
WGC3Duint); WGC3Duint);
WGC3Duint WebGraphicsContext3DCommandBufferImpl::createImageCHROMIUM(
WGC3Dsizei width,
WGC3Dsizei height,
WGC3Denum internalformat) {
return gl_->CreateImageCHROMIUM(
width, height, internalformat, GL_IMAGE_MAP_CHROMIUM);
}
DELEGATE_TO_GL_1(destroyImageCHROMIUM, DestroyImageCHROMIUM, WGC3Duint); DELEGATE_TO_GL_1(destroyImageCHROMIUM, DestroyImageCHROMIUM, WGC3Duint);
DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM, DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM,
...@@ -1359,12 +1351,6 @@ DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM, ...@@ -1359,12 +1351,6 @@ DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM,
DELEGATE_TO_GL_1R(mapImageCHROMIUM, MapImageCHROMIUM, WGC3Duint, void*); DELEGATE_TO_GL_1R(mapImageCHROMIUM, MapImageCHROMIUM, WGC3Duint, void*);
void* WebGraphicsContext3DCommandBufferImpl::mapImageCHROMIUM(
WGC3Duint image_id,
WGC3Denum access) {
return gl_->MapImageCHROMIUM(image_id);
}
DELEGATE_TO_GL_1(unmapImageCHROMIUM, UnmapImageCHROMIUM, WGC3Duint); DELEGATE_TO_GL_1(unmapImageCHROMIUM, UnmapImageCHROMIUM, WGC3Duint);
DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT, DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT,
......
...@@ -652,9 +652,6 @@ class WebGraphicsContext3DCommandBufferImpl ...@@ -652,9 +652,6 @@ class WebGraphicsContext3DCommandBufferImpl
virtual void vertexAttribDivisorANGLE(WGC3Duint index, WGC3Duint divisor); virtual void vertexAttribDivisorANGLE(WGC3Duint index, WGC3Duint divisor);
// GL_CHROMIUM_map_image // GL_CHROMIUM_map_image
// TODO(alexst): remove this old function after blink cleanup.
virtual WGC3Duint createImageCHROMIUM(
WGC3Dsizei width, WGC3Dsizei height, WGC3Denum internalformat);
virtual WGC3Duint createImageCHROMIUM(WGC3Dsizei width, virtual WGC3Duint createImageCHROMIUM(WGC3Dsizei width,
WGC3Dsizei height, WGC3Dsizei height,
WGC3Denum internalformat, WGC3Denum internalformat,
...@@ -662,8 +659,6 @@ class WebGraphicsContext3DCommandBufferImpl ...@@ -662,8 +659,6 @@ class WebGraphicsContext3DCommandBufferImpl
virtual void destroyImageCHROMIUM(WGC3Duint image_id); virtual void destroyImageCHROMIUM(WGC3Duint image_id);
virtual void getImageParameterivCHROMIUM( virtual void getImageParameterivCHROMIUM(
WGC3Duint image_id, WGC3Denum pname, WGC3Dint* params); WGC3Duint image_id, WGC3Denum pname, WGC3Dint* params);
// TODO(alexst): remove this old function after blink cleanup.
virtual void* mapImageCHROMIUM(WGC3Duint image_id, WGC3Denum access);
virtual void* mapImageCHROMIUM(WGC3Duint image_id); virtual void* mapImageCHROMIUM(WGC3Duint image_id);
virtual void unmapImageCHROMIUM(WGC3Duint image_id); virtual void unmapImageCHROMIUM(WGC3Duint image_id);
......
...@@ -1146,15 +1146,6 @@ DELEGATE_TO_GL_4R(createImageCHROMIUM, ...@@ -1146,15 +1146,6 @@ DELEGATE_TO_GL_4R(createImageCHROMIUM,
WGC3Denum, WGC3Denum,
WGC3Duint); WGC3Duint);
WGC3Duint WebGraphicsContext3DInProcessCommandBufferImpl::createImageCHROMIUM(
WGC3Dsizei width,
WGC3Dsizei height,
WGC3Denum internalformat) {
ClearContext();
return gl_->CreateImageCHROMIUM(
width, height, internalformat, GL_IMAGE_MAP_CHROMIUM);
}
DELEGATE_TO_GL_1(destroyImageCHROMIUM, DestroyImageCHROMIUM, WGC3Duint); DELEGATE_TO_GL_1(destroyImageCHROMIUM, DestroyImageCHROMIUM, WGC3Duint);
DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM, DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM,
...@@ -1162,13 +1153,6 @@ DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM, ...@@ -1162,13 +1153,6 @@ DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM,
DELEGATE_TO_GL_1R(mapImageCHROMIUM, MapImageCHROMIUM, WGC3Duint, void*); DELEGATE_TO_GL_1R(mapImageCHROMIUM, MapImageCHROMIUM, WGC3Duint, void*);
void* WebGraphicsContext3DInProcessCommandBufferImpl::mapImageCHROMIUM(
WGC3Duint image_id,
WGC3Denum access) {
ClearContext();
return gl_->MapImageCHROMIUM(image_id);
}
DELEGATE_TO_GL_1(unmapImageCHROMIUM, UnmapImageCHROMIUM, WGC3Duint); DELEGATE_TO_GL_1(unmapImageCHROMIUM, UnmapImageCHROMIUM, WGC3Duint);
DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT, DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT,
......
...@@ -477,9 +477,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl ...@@ -477,9 +477,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
virtual void texStorage2DEXT( virtual void texStorage2DEXT(
WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat, WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat,
WGC3Dint width, WGC3Dint height); WGC3Dint width, WGC3Dint height);
// TODO(alexst): remove this old function after blink cleanup.
virtual WGC3Duint createImageCHROMIUM(
WGC3Dsizei width, WGC3Dsizei height, WGC3Denum internalformat);
virtual WGC3Duint createImageCHROMIUM(WGC3Dsizei width, virtual WGC3Duint createImageCHROMIUM(WGC3Dsizei width,
WGC3Dsizei height, WGC3Dsizei height,
WGC3Denum internalformat, WGC3Denum internalformat,
...@@ -487,8 +484,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl ...@@ -487,8 +484,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
virtual void destroyImageCHROMIUM(WGC3Duint image_id); virtual void destroyImageCHROMIUM(WGC3Duint image_id);
virtual void getImageParameterivCHROMIUM( virtual void getImageParameterivCHROMIUM(
WGC3Duint image_id, WGC3Denum pname, WGC3Dint* params); WGC3Duint image_id, WGC3Denum pname, WGC3Dint* params);
// TODO(alexst): remove this old function after blink cleanup.
virtual void* mapImageCHROMIUM(WGC3Duint image_id, WGC3Denum access);
virtual void* mapImageCHROMIUM(WGC3Duint image_id); virtual void* mapImageCHROMIUM(WGC3Duint image_id);
virtual void unmapImageCHROMIUM(WGC3Duint image_id); virtual void unmapImageCHROMIUM(WGC3Duint image_id);
virtual WebGLId createQueryEXT(); virtual WebGLId createQueryEXT();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment