| Index: gpu/command_buffer/client/query_tracker.cc
|
| diff --git a/gpu/command_buffer/client/query_tracker.cc b/gpu/command_buffer/client/query_tracker.cc
|
| index 54e8d850908414e1ded50077a26adfc947dac92d..5d08f2e7d1441dd6b3f566e1f2a55dec304169ab 100644
|
| --- a/gpu/command_buffer/client/query_tracker.cc
|
| +++ b/gpu/command_buffer/client/query_tracker.cc
|
| @@ -4,9 +4,7 @@
|
|
|
| #include "../client/query_tracker.h"
|
|
|
| -#if !defined(__native_client__)
|
| - #include "base/atomicops.h"
|
| -#endif
|
| +#include "../client/atomicops.h"
|
| #include "../client/cmd_buffer_helper.h"
|
| #include "../client/mapped_memory.h"
|
|
|
| @@ -59,11 +57,7 @@ bool QueryTracker::Query::CheckResultsAvailable(
|
| if (info_.sync->process_count == submit_count_) {
|
| // Need a MemoryBarrier here so that sync->result read after
|
| // sync->process_count.
|
| - #if defined(__native_client__)
|
| - __sync_synchronize();
|
| - #else
|
| - base::subtle::MemoryBarrier();
|
| - #endif
|
| + gpu::MemoryBarrier();
|
| result_ = info_.sync->result;
|
| state_ = kComplete;
|
| } else {
|
|
|