Fix two issues

Make sure DX11 and DX12 respect the OpenContext flags
Make sure OpenGL ignores non-AMD hardware

Author: chesik-amd

Src/GPUPerfAPIDX11/GPUPerfAPIDX11.cpp

@@ -559,7 +559,17 @@ GPA_Status GPA_IMP_OpenContext(void* pContext)
 
     getCurrentContext()->SetDX11DeviceContext(pDeviceContext);
 
-    return GenerateCounters(GPA_API_DIRECTX_11, vendorId, deviceId, revisionId, (GPA_ICounterAccessor**) & (g_pCurrentContext->m_pCounterAccessor), &(getCurrentContext()->m_pCounterScheduler));
+    GPA_Status result = GenerateCounters(GPA_API_DIRECTX_11, vendorId, deviceId, revisionId, (GPA_ICounterAccessor**) & (g_pCurrentContext->m_pCounterAccessor), &(getCurrentContext()->m_pCounterScheduler));
+
+    if (GPA_STATUS_OK == result)
+    {
+        g_pCurrentContext->m_pCounterAccessor->SetAllowedCounters(g_pCurrentContext->ExposePublicCounters(),
+                                                                  g_pCurrentContext->ExposeHardwareCounters(),
+                                                                  g_pCurrentContext->ExposeSoftwareCounters());
+    }
+
+    return result;
+
 }
 
 //-----------------------------------------------------------------------------

Src/GPUPerfAPIDX12/GPUPerfAPIDX12.cpp

@@ -329,6 +329,9 @@ GPA_Status GPA_IMP_OpenContext(void* pContext)
 
                 if (GPA_STATUS_OK == result)
                 {
+                    pCounterAccessor->SetAllowedCounters(GetCurrentContext()->ExposePublicCounters(),
+                                                         GetCurrentContext()->ExposeHardwareCounters(),
+                                                         GetCurrentContext()->ExposeSoftwareCounters());
                     GetCurrentContext()->m_pCounterAccessor =
                         static_cast<GPA_CounterGeneratorBase*>(pCounterAccessor);
                     GetCurrentContext()->m_pCounterScheduler = pCounterScheduler;

Src/GPUPerfAPIGL/GPUPerfAPIGL.cpp

@@ -581,17 +581,11 @@ GPA_Status GPA_IMP_GetHWInfo(void* pContext, GPA_HWInfo* pHwInfo)
     //TODO: should at least support GPUTime for these vendors then
     if (nullptr != strstr(reinterpret_cast<const char*>(pVendor), pNVIDIARenderer))
     {
-        pHwInfo->SetVendorID(NVIDIA_VENDOR_ID);
-        pHwInfo->SetDeviceName(reinterpret_cast<const char*>(pRenderer));
-        pHwInfo->SetHWGeneration(GDT_HW_GENERATION_NVIDIA);
-        return GPA_STATUS_OK;
+        return GPA_STATUS_ERROR_HARDWARE_NOT_SUPPORTED;
     }
     else if (nullptr != strstr(reinterpret_cast<const char*>(pVendor), pIntelRenderer))
     {
-        pHwInfo->SetVendorID(INTEL_VENDOR_ID);
-        pHwInfo->SetDeviceName(reinterpret_cast<const char*>(pRenderer));
-        pHwInfo->SetHWGeneration(GDT_HW_GENERATION_INTEL);
-        return GPA_STATUS_OK;
+        return GPA_STATUS_ERROR_HARDWARE_NOT_SUPPORTED;
     }
 
     // instead of checking the vendor string to make sure it is ATI / AMD,
@@ -792,26 +786,12 @@ GPA_Status GPA_IMP_CompareHWInfo(void* pContext, GPA_HWInfo* pHwInfo)
 
     if (strstr(reinterpret_cast<const char*>(pVendor), pNVIDIARenderer))
     {
-        if (pHwInfo->IsNVidia())
-        {
-            return GPA_STATUS_OK;
-        }
-        else
-        {
-            return GPA_STATUS_ERROR_HARDWARE_NOT_SUPPORTED;
-        }
+        return GPA_STATUS_ERROR_HARDWARE_NOT_SUPPORTED;
     }
 
     if (strstr(reinterpret_cast<const char*>(pVendor), pIntelRenderer))
     {
-        if (pHwInfo->IsIntel())
-        {
-            return GPA_STATUS_OK;
-        }
-        else
-        {
-            return GPA_STATUS_ERROR_HARDWARE_NOT_SUPPORTED;
-        }
+        return GPA_STATUS_ERROR_HARDWARE_NOT_SUPPORTED;
     }
 
     GPA_LogError("A unknown graphics card was identified.");