diff options
4 files changed, 10 insertions, 6 deletions
diff --git a/content/renderer/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc index 6f23d2da..39e7919 100644 --- a/content/renderer/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc @@ -22,6 +22,7 @@ #include "chrome/renderer/render_thread.h" #include "content/renderer/gpu_channel_host.h" #include "content/renderer/render_view.h" +#include "gpu/command_buffer/common/constants.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" @@ -346,7 +347,7 @@ void WebGraphicsContext3DCommandBufferImpl::getParentToChildLatchCHROMIUM( if (!context_->GetParentToChildLatch(latch_id)) { LOG(ERROR) << "getLatch must only be called on child context"; synthesizeGLError(GL_INVALID_OPERATION); - *latch_id = 0xffffffffu; + *latch_id = gpu::kInvalidLatchId; } } @@ -356,7 +357,7 @@ void WebGraphicsContext3DCommandBufferImpl::getChildToParentLatchCHROMIUM( if (!context_->GetChildToParentLatch(latch_id)) { LOG(ERROR) << "getLatch must only be called on child context"; synthesizeGLError(GL_INVALID_OPERATION); - *latch_id = 0xffffffffu; + *latch_id = gpu::kInvalidLatchId; } } diff --git a/gpu/command_buffer/common/constants.h b/gpu/command_buffer/common/constants.h index 521a8b6..bebc046 100644 --- a/gpu/command_buffer/common/constants.h +++ b/gpu/command_buffer/common/constants.h @@ -46,6 +46,9 @@ const int32 kCommandBufferSharedMemoryId = 4; // Common Latch shared memory transfer buffer ID. const int32 kLatchSharedMemoryId = 5; +// Invalid latch ID. +const int32 kInvalidLatchId = 0xffffffffu; + } // namespace gpu #endif // GPU_COMMAND_BUFFER_COMMON_CONSTANTS_H_ diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index 27a0c99..32b3fa3 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -654,12 +654,12 @@ void WebGraphicsContext3DInProcessImpl::copyTextureToParentTextureCHROMIUM( glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, bound_fbo_); } -void WebGraphicsContext3DInProcessImpl::getLatchParentToChildCHROMIUM( +void WebGraphicsContext3DInProcessImpl::getParentToChildLatchCHROMIUM( WGC3Duint* latch_id) { } -void WebGraphicsContext3DInProcessImpl::getLatchChildToParentCHROMIUM( +void WebGraphicsContext3DInProcessImpl::getChildToParentLatchCHROMIUM( WGC3Duint* latch_id) { } diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h index 600b22c..015bdfa 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h @@ -89,8 +89,8 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D { virtual void copyTextureToParentTextureCHROMIUM( WebGLId texture, WebGLId parentTexture); - virtual void getLatchParentToChildCHROMIUM(WGC3Duint* latch_id); - virtual void getLatchChildToParentCHROMIUM(WGC3Duint* latch_id); + virtual void getParentToChildLatchCHROMIUM(WGC3Duint* latch_id); + virtual void getChildToParentLatchCHROMIUM(WGC3Duint* latch_id); virtual void waitLatchCHROMIUM(WGC3Duint latch_id); virtual void setLatchCHROMIUM(WGC3Duint latch_id); |