summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordyen <dyen@chromium.org>2016-01-21 15:24:12 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-21 23:25:45 +0000
commitd9e65a92d8ddbcaaec90c286df45dec0eb03236a (patch)
treecb1b3de543ccdd6422ef8cb403607b30d4b6a4e2
parent6b8f7eda3e34236f23b9db956de2211cbac688f9 (diff)
downloadchromium_src-d9e65a92d8ddbcaaec90c286df45dec0eb03236a.zip
chromium_src-d9e65a92d8ddbcaaec90c286df45dec0eb03236a.tar.gz
chromium_src-d9e65a92d8ddbcaaec90c286df45dec0eb03236a.tar.bz2
Removed old sync points from Ppapi.
BUG=514815 Review URL: https://codereview.chromium.org/1609033002 Cr-Commit-Position: refs/heads/master@{#370821}
-rw-r--r--content/renderer/pepper/ppb_graphics_3d_impl.cc12
-rw-r--r--content/renderer/pepper/ppb_graphics_3d_impl.h3
-rw-r--r--ppapi/proxy/ppapi_command_buffer_proxy.cc21
-rw-r--r--ppapi/proxy/ppapi_messages.h9
-rw-r--r--ppapi/proxy/ppb_graphics_3d_proxy.cc44
-rw-r--r--ppapi/proxy/ppb_graphics_3d_proxy.h7
-rw-r--r--ppapi/thunk/ppb_graphics_3d_api.h3
7 files changed, 5 insertions, 94 deletions
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc
index 03e26d7..46ea946 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.cc
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
@@ -131,18 +131,6 @@ gpu::CommandBuffer::State PPB_Graphics3D_Impl::WaitForGetOffsetInRange(
return GetCommandBuffer()->GetLastState();
}
-uint32_t PPB_Graphics3D_Impl::InsertSyncPoint() {
- return command_buffer_->InsertSyncPoint();
-}
-
-uint32_t PPB_Graphics3D_Impl::InsertFutureSyncPoint() {
- return command_buffer_->InsertFutureSyncPoint();
-}
-
-void PPB_Graphics3D_Impl::RetireSyncPoint(uint32_t sync_point) {
- return command_buffer_->RetireSyncPoint(sync_point);
-}
-
void PPB_Graphics3D_Impl::EnsureWorkVisible() {
command_buffer_->EnsureWorkVisible();
}
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.h b/content/renderer/pepper/ppb_graphics_3d_impl.h
index e4dd156..651efd2 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.h
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.h
@@ -46,9 +46,6 @@ class PPB_Graphics3D_Impl : public ppapi::PPB_Graphics3D_Shared {
int32_t end) override;
gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start,
int32_t end) override;
- uint32_t InsertSyncPoint() override;
- uint32_t InsertFutureSyncPoint() override;
- void RetireSyncPoint(uint32_t) override;
void EnsureWorkVisible() override;
// Binds/unbinds the graphics of this context with the associated instance.
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc
index c645927..00c92eb 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc
@@ -237,28 +237,17 @@ int32_t PpapiCommandBufferProxy::GetExtraCommandBufferData() const {
}
uint32_t PpapiCommandBufferProxy::InsertSyncPoint() {
- uint32_t sync_point = 0;
- if (last_state_.error == gpu::error::kNoError) {
- Send(new PpapiHostMsg_PPBGraphics3D_InsertSyncPoint(
- ppapi::API_ID_PPB_GRAPHICS_3D, resource_, &sync_point));
- }
- return sync_point;
+ NOTREACHED();
+ return 0;
}
uint32_t PpapiCommandBufferProxy::InsertFutureSyncPoint() {
- uint32_t sync_point = 0;
- if (last_state_.error == gpu::error::kNoError) {
- Send(new PpapiHostMsg_PPBGraphics3D_InsertFutureSyncPoint(
- ppapi::API_ID_PPB_GRAPHICS_3D, resource_, &sync_point));
- }
- return sync_point;
+ NOTREACHED();
+ return 0;
}
void PpapiCommandBufferProxy::RetireSyncPoint(uint32_t sync_point) {
- if (last_state_.error == gpu::error::kNoError) {
- Send(new PpapiHostMsg_PPBGraphics3D_RetireSyncPoint(
- ppapi::API_ID_PPB_GRAPHICS_3D, resource_, sync_point));
- }
+ NOTREACHED();
}
void PpapiCommandBufferProxy::SignalSyncPoint(uint32_t sync_point,
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index d68f770..19ed110 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -1045,15 +1045,6 @@ IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBGraphics3D_DestroyTransferBuffer,
IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics3D_SwapBuffers,
ppapi::HostResource /* graphics_3d */,
gpu::SyncToken /* sync_token */)
-IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBGraphics3D_InsertSyncPoint,
- ppapi::HostResource /* context */,
- uint32_t /* sync_point */)
-IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBGraphics3D_InsertFutureSyncPoint,
- ppapi::HostResource /* context */,
- uint32_t /* sync_point */)
-IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics3D_RetireSyncPoint,
- ppapi::HostResource /* context */,
- uint32_t /* sync_point */)
IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBGraphics3D_EnsureWorkVisible,
ppapi::HostResource /* context */)
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc
index a5f1d92..0ad81ad 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.cc
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc
@@ -101,20 +101,6 @@ gpu::CommandBuffer::State Graphics3D::WaitForGetOffsetInRange(int32_t start,
return GetErrorState();
}
-uint32_t Graphics3D::InsertSyncPoint() {
- NOTREACHED();
- return 0;
-}
-
-uint32_t Graphics3D::InsertFutureSyncPoint() {
- NOTREACHED();
- return 0;
-}
-
-void Graphics3D::RetireSyncPoint(uint32_t sync_point) {
- NOTREACHED();
-}
-
void Graphics3D::EnsureWorkVisible() {
NOTREACHED();
}
@@ -226,12 +212,6 @@ bool PPB_Graphics3D_Proxy::OnMessageReceived(const IPC::Message& msg) {
OnMsgDestroyTransferBuffer)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_SwapBuffers,
OnMsgSwapBuffers)
- IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_InsertSyncPoint,
- OnMsgInsertSyncPoint)
- IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_InsertFutureSyncPoint,
- OnMsgInsertFutureSyncPoint)
- IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_RetireSyncPoint,
- OnMsgRetireSyncPoint)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_EnsureWorkVisible,
OnMsgEnsureWorkVisible)
#endif // !defined(OS_NACL)
@@ -363,30 +343,6 @@ void PPB_Graphics3D_Proxy::OnMsgSwapBuffers(const HostResource& context,
enter.SetResult(enter.object()->SwapBuffers(enter.callback(), sync_token));
}
-void PPB_Graphics3D_Proxy::OnMsgInsertSyncPoint(const HostResource& context,
- uint32_t* sync_point) {
- *sync_point = 0;
- EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
- if (enter.succeeded())
- *sync_point = enter.object()->InsertSyncPoint();
-}
-
-void PPB_Graphics3D_Proxy::OnMsgInsertFutureSyncPoint(
- const HostResource& context,
- uint32_t* sync_point) {
- *sync_point = 0;
- EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
- if (enter.succeeded())
- *sync_point = enter.object()->InsertFutureSyncPoint();
-}
-
-void PPB_Graphics3D_Proxy::OnMsgRetireSyncPoint(const HostResource& context,
- uint32_t sync_point) {
- EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
- if (enter.succeeded())
- enter.object()->RetireSyncPoint(sync_point);
-}
-
void PPB_Graphics3D_Proxy::OnMsgEnsureWorkVisible(const HostResource& context) {
EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
if (enter.succeeded())
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h
index a30fd6c..f6805da 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.h
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -53,9 +53,6 @@ class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared {
int32_t end) override;
gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start,
int32_t end) override;
- uint32_t InsertSyncPoint() override;
- uint32_t InsertFutureSyncPoint() override;
- void RetireSyncPoint(uint32_t sync_point) override;
void EnsureWorkVisible() override;
private:
@@ -112,10 +109,6 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy {
void OnMsgDestroyTransferBuffer(const HostResource& context, int32_t id);
void OnMsgSwapBuffers(const HostResource& context,
const gpu::SyncToken& sync_token);
- void OnMsgInsertSyncPoint(const HostResource& context, uint32_t* sync_point);
- void OnMsgInsertFutureSyncPoint(const HostResource& context,
- uint32_t* sync_point);
- void OnMsgRetireSyncPoint(const HostResource& context, uint32_t sync_point);
void OnMsgEnsureWorkVisible(const HostResource& context);
// Renderer->plugin message handlers.
void OnMsgSwapBuffersACK(const HostResource& context,
diff --git a/ppapi/thunk/ppb_graphics_3d_api.h b/ppapi/thunk/ppb_graphics_3d_api.h
index 231c0ac..bfbf2a5 100644
--- a/ppapi/thunk/ppb_graphics_3d_api.h
+++ b/ppapi/thunk/ppb_graphics_3d_api.h
@@ -59,9 +59,6 @@ class PPAPI_THUNK_EXPORT PPB_Graphics3D_API {
GLenum access) = 0;
virtual void UnmapTexSubImage2DCHROMIUM(const void* mem) = 0;
- virtual uint32_t InsertSyncPoint() = 0;
- virtual uint32_t InsertFutureSyncPoint() = 0;
- virtual void RetireSyncPoint(uint32_t sync_point) = 0;
virtual void EnsureWorkVisible() = 0;
};