Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -27,7 +27,11 @@ void COcclusionQuery::Create()
    D3D11_QUERY_DESC desc;
    desc.Query = D3D11_QUERY_OCCLUSION;
    desc.MiscFlags = 0;
-    HRESULT hr(gcpRendD3D->GetDevice().CreateQuery(&desc, &pVizQuery));
+
+#if !defined(NDEBUG)
+    HRESULT hr =
+#endif
+        gcpRendD3D->GetDevice().CreateQuery(&desc, &pVizQuery);
    assert(SUCCEEDED(hr));

    m_nOcclusionID = (UINT_PTR) pVizQuery;