| Index: gpu/ipc/client/gpu_channel_host.h
|
| diff --git a/gpu/ipc/client/gpu_channel_host.h b/gpu/ipc/client/gpu_channel_host.h
|
| index 989f1df6a8d60895655b94d7a755fb88aa3c791b..15543be6aadcc96031ec93472d95be88c035af6c 100644
|
| --- a/gpu/ipc/client/gpu_channel_host.h
|
| +++ b/gpu/ipc/client/gpu_channel_host.h
|
| @@ -41,7 +41,7 @@ class GpuMemoryBufferManager;
|
| }
|
|
|
| namespace gpu {
|
| -
|
| +struct SyncToken;
|
| class GpuChannelHost;
|
| using GpuChannelEstablishedCallback =
|
| base::Callback<void(scoped_refptr<GpuChannelHost>)>;
|
| @@ -101,14 +101,16 @@ class GPU_EXPORT GpuChannelHost
|
| // routes. Combines multiple OrderingBarriers into a single AsyncFlush.
|
| // Returns the flush ID for the stream or 0 if put offset was not changed.
|
| // Outputs *highest_verified_flush_id.
|
| - uint32_t OrderingBarrier(int32_t route_id,
|
| - int32_t stream_id,
|
| - int32_t put_offset,
|
| - uint32_t flush_count,
|
| - const std::vector<ui::LatencyInfo>& latency_info,
|
| - bool put_offset_changed,
|
| - bool do_flush,
|
| - uint32_t* highest_verified_flush_id);
|
| + uint32_t OrderingBarrier(
|
| + int32_t route_id,
|
| + int32_t stream_id,
|
| + int32_t put_offset,
|
| + uint32_t flush_count,
|
| + const std::vector<ui::LatencyInfo>& latency_info,
|
| + const std::vector<SyncToken>& sync_token_dependencies,
|
| + bool put_offset_changed,
|
| + bool do_flush,
|
| + uint32_t* highest_verified_flush_id);
|
|
|
| void FlushPendingStream(int32_t stream_id);
|
|
|
| @@ -232,6 +234,7 @@ class GPU_EXPORT GpuChannelHost
|
| uint32_t flush_count;
|
| uint32_t flush_id;
|
| std::vector<ui::LatencyInfo> latency_info;
|
| + std::vector<SyncToken> sync_token_dependencies;
|
| };
|
|
|
| GpuChannelHost(GpuChannelHostFactory* factory,
|
|
|