Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:22:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjusting the task::Engine run signature to appease gcc gods and other warnings

Browse source
This commit is contained in:
samcake 2018-04-25 12:23:30 -07:00
parent 5b5cad38e8
commit 32e83c256a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/workload/GameWorkload.cpp
View file

@ -14,7 +14,6 @@
#include <workload/SpaceClassifier.h> #include <workload/SpaceClassifier.h>
#include "PhysicsBoundary.h" #include "PhysicsBoundary.h"
#pragma optimize( "[optimization-list]", off )
ControlViews::ControlViews() { ControlViews::ControlViews() {
regionBackFronts[0] = glm::vec2(1.0f, 3.0f); regionBackFronts[0] = glm::vec2(1.0f, 3.0f);
@ -53,7 +52,7 @@ glm::vec2 Regulator::run(const Timing_ns& regulationDuration, const Timing_ns& m
// Regulate next value based on current moving toward the goal budget // Regulate next value based on current moving toward the goal budget
float error_ms = std::chrono::duration<float, std::milli>(_budget - measured).count(); float error_ms = std::chrono::duration<float, std::milli>(_budget - measured).count();
float coef = error_ms / std::chrono::duration<float, std::milli>(regulationDuration).count(); float coef = error_ms / std::chrono::duration<float, std::milli>(regulationDuration).count();
next += coef * (error_ms < 0.0 ? _speedDown : _speedUp); next += coef * (error_ms < 0.0f ? _speedDown : _speedUp);
// Clamp to min max // Clamp to min max
next = glm::clamp(next, _minRange, _maxRange); next = glm::clamp(next, _minRange, _maxRange);
@ -78,7 +77,6 @@ void ControlViews::regulateViews(workload::Views& outViews, const workload::Timi
_dataExport.timings[workload::Region::R2] = _dataExport.timings[workload::Region::R1]; _dataExport.timings[workload::Region::R2] = _dataExport.timings[workload::Region::R1];
_dataExport.timings[workload::Region::R3] = std::chrono::duration<float, std::milli>(timings[1]).count(); _dataExport.timings[workload::Region::R3] = std::chrono::duration<float, std::milli>(timings[1]).count();
int i = 0;
for (auto& outView : outViews) { for (auto& outView : outViews) {
outView.regionBackFronts[workload::Region::R1] = regionBackFronts[workload::Region::R1]; outView.regionBackFronts[workload::Region::R1] = regionBackFronts[workload::Region::R1];
outView.regionBackFronts[workload::Region::R2] = regionBackFronts[workload::Region::R2]; outView.regionBackFronts[workload::Region::R2] = regionBackFronts[workload::Region::R2];
@ -88,8 +86,6 @@ void ControlViews::regulateViews(workload::Views& outViews, const workload::Timi
} }
} }
#pragma optimize( "[optimization-list]", on )
class WorkloadEngineBuilder { class WorkloadEngineBuilder {
public: public:
public: public:

6
libraries/task/src/task/Task.h
View file

@ -399,11 +399,15 @@ public:
void run() { void run() {
if (_context) { if (_context) {
TaskType::run(_context); run(_context);
} }
} }
protected: protected:
void run(const ContextPointer& jobContext) override {
TaskType::run(_context);
}
ContextPointer _context; ContextPointer _context;
}; };
} }