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

@@ -168,7 +168,7 @@ EventQueue::waitForEvent(uint32 event, uint32 waitType)
         flush();
     }
     uint64 param;
-    m_queries[slot]->GetResult(m_cs, &param, waitType);
+    m_queries[slot]->GetResult(m_cs, &param, (IOSyncWaitType) waitType);
 
     // cache the most recently retired event
     if ((event < m_headId) && (event > m_latestRetired))