From 1007ae8903b75422b6fe46c544d6ccd9257740e7 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 11 Jan 2017 11:49:32 -0500 Subject: [PATCH] P4 to Git Change 1360715 by nmonday@nmonday-ugl-10-1 on 2017/01/11 11:38:12 SWDEV-109652 - Pool multiple timestamps into a single allocation Before submitting http://ocltc.amd.com/reviews/r/12044/, I am changing gsl::QueryObject::QueryCounter(gsCtx\* ctx, uint32 index) to gsl::QueryObject::QueryCounterIndexed(gsCtx\* ctx, uint32 id, uint32 index). Where the 'id' parameter is non-default. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/EventQueue.cpp#7 edit --- rocclr/runtime/device/gpu/gslbe/src/rt/EventQueue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/runtime/device/gpu/gslbe/src/rt/EventQueue.cpp b/rocclr/runtime/device/gpu/gslbe/src/rt/EventQueue.cpp index 5b732b0198..a842d9f1bb 100644 --- a/rocclr/runtime/device/gpu/gslbe/src/rt/EventQueue.cpp +++ b/rocclr/runtime/device/gpu/gslbe/src/rt/EventQueue.cpp @@ -168,7 +168,7 @@ EventQueue::waitForEvent(uint32 event, uint32 waitType) flush(); } uint64 param; - m_queries[slot]->GetResult(m_cs, ¶m, waitType); + m_queries[slot]->GetResult(m_cs, ¶m, (IOSyncWaitType) waitType); // cache the most recently retired event if ((event < m_headId) && (event > m_latestRetired))