EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed

Samuel Gateau committed 7 years ago

Commit 6ef65201 parent 9d9b80d9 files · +140 −14Browse files

Showing the changes to interface/src/scripting/PlatformInfoScriptingInterface.cpp (1 of 9 files). Show all

Unified · Split

interface/src/scripting/PlatformInfoScriptingInterface.cpp+9−3

@@ -167,7 +167,9 @@ bool PlatformInfoScriptingInterface::isStandalone() { · 166 unmodified lines
167	int PlatformInfoScriptingInterface::getNumCPUs() {	167	int PlatformInfoScriptingInterface::getNumCPUs() {
168	return platform::getNumCPUs();	168	return platform::getNumCPUs();
169	}	169	}
170		170	int PlatformInfoScriptingInterface::getMasterCPU() {
		171	return platform::getMasterCPU();
		172	}
171	QString PlatformInfoScriptingInterface::getCPU(int index) {	173	QString PlatformInfoScriptingInterface::getCPU(int index) {
172	auto desc = platform::getCPU(index);	174	auto desc = platform::getCPU(index);
173	return QString(desc.dump().c_str());	175	return QString(desc.dump().c_str());
@@ -176,7 +178,9 @@ QString PlatformInfoScriptingInterface::getCPU(int index) { · 2 unmodified lines
176	int PlatformInfoScriptingInterface::getNumGPUs() {	178	int PlatformInfoScriptingInterface::getNumGPUs() {
177	return platform::getNumGPUs();	179	return platform::getNumGPUs();
178	}	180	}
179		181	int PlatformInfoScriptingInterface::getMasterGPU() {
		182	return platform::getMasterGPU();
		183	}
180	QString PlatformInfoScriptingInterface::getGPU(int index) {	184	QString PlatformInfoScriptingInterface::getGPU(int index) {
181	auto desc = platform::getGPU(index);	185	auto desc = platform::getGPU(index);
182	return QString(desc.dump().c_str());	186	return QString(desc.dump().c_str());
@@ -185,7 +189,9 @@ QString PlatformInfoScriptingInterface::getGPU(int index) { · 2 unmodified lines
185	int PlatformInfoScriptingInterface::getNumDisplays() {	189	int PlatformInfoScriptingInterface::getNumDisplays() {
186	return platform::getNumDisplays();	190	return platform::getNumDisplays();
187	}	191	}
188		192	int PlatformInfoScriptingInterface::getMasterDisplay() {
		193	return platform::getMasterDisplay();
		194	}
189	QString PlatformInfoScriptingInterface::getDisplay(int index) {	195	QString PlatformInfoScriptingInterface::getDisplay(int index) {
190	auto desc = platform::getDisplay(index);	196	auto desc = platform::getDisplay(index);
191	return QString(desc.dump().c_str());	197	return QString(desc.dump().c_str());