From c85b0572e592a988b710e23b28b33a08dcec30c8 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 1 Aug 2019 17:17:47 -0700 Subject: [PATCH] fixing function name --- libraries/platform/src/platform/backend/MACOSPlatform.cpp | 4 ++-- libraries/platform/src/platform/backend/MACOSPlatform.h | 2 +- libraries/platform/src/platform/backend/PlatformInstance.cpp | 4 ++-- libraries/platform/src/platform/backend/PlatformInstance.h | 2 +- libraries/platform/src/platform/backend/WINPlatform.cpp | 4 ++-- libraries/platform/src/platform/backend/WINPlatform.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/platform/src/platform/backend/MACOSPlatform.cpp b/libraries/platform/src/platform/backend/MACOSPlatform.cpp index 8b37cd36b5..5a7b40f71b 100644 --- a/libraries/platform/src/platform/backend/MACOSPlatform.cpp +++ b/libraries/platform/src/platform/backend/MACOSPlatform.cpp @@ -322,8 +322,8 @@ void MACOSInstance::enumerateComputer(){ } -void MACOSInstance::enumerateRenderingApis() { - Instance::enumerateRenderingApis(); +void MACOSInstance::enumerateGraphicsApis() { + Instance::enumerateGraphicsApis(); // TODO imeplement Metal query } diff --git a/libraries/platform/src/platform/backend/MACOSPlatform.h b/libraries/platform/src/platform/backend/MACOSPlatform.h index 464d2ced5e..87c16972ec 100644 --- a/libraries/platform/src/platform/backend/MACOSPlatform.h +++ b/libraries/platform/src/platform/backend/MACOSPlatform.h @@ -19,7 +19,7 @@ namespace platform { void enumerateGpusAndDisplays() override; void enumerateMemory() override; void enumerateComputer() override; - void enumerateRenderingApis() override; + void enumerateGraphicsApis() override; }; } // namespace platform diff --git a/libraries/platform/src/platform/backend/PlatformInstance.cpp b/libraries/platform/src/platform/backend/PlatformInstance.cpp index faea24289a..d73abf5286 100644 --- a/libraries/platform/src/platform/backend/PlatformInstance.cpp +++ b/libraries/platform/src/platform/backend/PlatformInstance.cpp @@ -39,7 +39,7 @@ bool Instance::enumeratePlatform() { enumerateCpus(); enumerateGpusAndDisplays(); enumerateNics(); - enumerateRenderingApis(); + enumerateGraphicsApis(); // eval the master index for each platform scopes updateMasterIndices(); @@ -122,7 +122,7 @@ static std::string vkVersionToString(uint32_t version) { #endif -void Instance::enumerateRenderingApis() { +void Instance::enumerateGraphicsApis() { // OpenGL rendering API is supported on all platforms { auto& glContextInfo = gl::ContextInfo::get(); diff --git a/libraries/platform/src/platform/backend/PlatformInstance.h b/libraries/platform/src/platform/backend/PlatformInstance.h index 7cb419ceca..2b263c21ef 100644 --- a/libraries/platform/src/platform/backend/PlatformInstance.h +++ b/libraries/platform/src/platform/backend/PlatformInstance.h @@ -44,7 +44,7 @@ public: void virtual enumerateNics(); void virtual enumerateMemory() = 0; void virtual enumerateComputer()=0; - virtual void enumerateRenderingApis(); + virtual void enumerateGraphicsApis(); virtual ~Instance(); diff --git a/libraries/platform/src/platform/backend/WINPlatform.cpp b/libraries/platform/src/platform/backend/WINPlatform.cpp index e0585aa14b..8c0bb1b9aa 100644 --- a/libraries/platform/src/platform/backend/WINPlatform.cpp +++ b/libraries/platform/src/platform/backend/WINPlatform.cpp @@ -252,8 +252,8 @@ void WINInstance::enumerateNics() { #endif } -void WINInstance::enumerateRenderingApis() { - Instance::enumerateRenderingApis(); +void WINInstance::enumerateGraphicsApis() { + Instance::enumerateGraphicsApis(); // TODO imeplement D3D 11/12 queries } diff --git a/libraries/platform/src/platform/backend/WINPlatform.h b/libraries/platform/src/platform/backend/WINPlatform.h index 0a92efb948..dd29d696dc 100644 --- a/libraries/platform/src/platform/backend/WINPlatform.h +++ b/libraries/platform/src/platform/backend/WINPlatform.h @@ -20,7 +20,7 @@ namespace platform { void enumerateMemory() override; void enumerateComputer () override; void enumerateNics() override; - void enumerateRenderingApis() override; + void enumerateGraphicsApis() override; }; } // namespace platform