P4 to Git Change 1185351 by rili@rili_opencl_stg on 2015/08/27 16:33:46

EPR #425788 - Remove uvd/vce related code from GSL&UGL

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#128 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#78 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#137 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#55 edit

rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp

@@ -244,8 +244,6 @@ CALGSLDevice::open(uint32 gpuIndex, bool enableHighPerformanceState, bool report
 void
 CALGSLDevice::close()
 {
-    gslVidShutdown();
-
     if (m_cs != NULL)
     {
         m_cs->Flush();
@@ -268,9 +266,6 @@ CALGSLDevice::close()
         m_cs->destroySampler(m_textureSampler);
         m_cs->destroyQuery(m_mapQuery);
         m_cs->destroyQuery(m_mapDMAQuery);
-        m_cs->destroyQuery(m_mapUVDQuery);
-
-        m_cs->destroyQuery(m_mapVCEQuery);
 
         m_cs->setRenderState(0);
         m_cs->destroyRenderState(m_rs);
@@ -594,9 +589,6 @@ CALGSLDevice::PerformFullInitialization_int()
 
         m_mapQuery = m_cs->createQuery(GSL_SYNC_ATI);
         m_mapDMAQuery = m_cs->createQuery(GSL_DRMDMA_SYNC_ATI);
-        m_mapUVDQuery = m_cs->createQuery(GSL_UVD_SYNC_ATI);
-
-        m_mapVCEQuery = m_cs->createQuery(GSL_VCE_SYNC_ATI);
 
         // Allocate 1x1 FART and Vid memory for DMA flush
         CALresourceDesc desc;
@@ -626,9 +618,6 @@ void
 Wait(gsl::gsCtx* cs, gslQueryTarget target, gslQueryObject object)
 {
     uint64 param;
-    // This should never be called for UVD/VCE Sync queries in case it is
-    // Please correctly pass on EngineMask else queries may be messed up
-    assert(target != GSL_UVD_SYNC_ATI || target != GSL_VCE_SYNC_ATI);
 
     uint32 mask = (target == GSL_DRMDMA_SYNC_ATI) ? GSL_ENGINE_MASK(GSL_ENGINEID_DRMDMA0) | GSL_ENGINE_MASK(GSL_ENGINEID_DRMDMA1) : GSL_ENGINEMASK_ALL_BUT_UVD_VCE;