From 859016bf37fadd49e94d5a10f46f6d15fc143f96 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Wed, 14 Aug 2019 10:28:42 -0700
Subject: [PATCH] Addressing review comments
---
libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp | 3 ---
libraries/render-utils/src/RenderForwardTask.cpp | 1 -
libraries/render-utils/src/RenderForwardTask.h | 4 ++--
libraries/task/src/task/Config.h | 2 --
libraries/task/src/task/Task.h | 1 -
scripts/developer/utilities/render/luci2.js | 4 ++--
6 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp b/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
index 1b21be2e73..227bad787b 100644
--- a/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
+++ b/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
@@ -56,9 +56,6 @@ void GL41Backend::postLinkProgram(ShaderObject& programObject, const Shader& pro
continue;
}
const auto& targetBinding = expectedResourceBuffers.at(resourceBuffer.name);
- if (resourceBuffer.name == std::string("polylineVerticesBuffer")) {
- qDebug() << "Setting texture unit for " << resourceBuffer.name.c_str() << " to " << targetBinding;
- }
glProgramUniform1i(glprogram, resourceBuffer.binding, targetBinding);
}
}
diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index 9b547b82bb..e34db755b7 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -52,7 +52,6 @@ void PreparePrimaryFramebufferMSAAConfig::setResolutionScale(float scale) {
const float SCALE_RANGE_MIN = 0.1f;
const float SCALE_RANGE_MAX = 2.0f;
resolutionScale = std::max(SCALE_RANGE_MIN, std::min(SCALE_RANGE_MAX, scale));
- // emit dirty();
}
void PreparePrimaryFramebufferMSAAConfig::setNumSamples(int num) {
diff --git a/libraries/render-utils/src/RenderForwardTask.h b/libraries/render-utils/src/RenderForwardTask.h
index 647994d3c0..6833e42449 100755
--- a/libraries/render-utils/src/RenderForwardTask.h
+++ b/libraries/render-utils/src/RenderForwardTask.h
@@ -42,8 +42,8 @@ public:
class PreparePrimaryFramebufferMSAAConfig : public render::Job::Config {
Q_OBJECT
- Q_PROPERTY(float resolutionScale WRITE setResolutionScale READ getResolutionScale NOTIFY dirty())
- Q_PROPERTY(int numSamples WRITE setNumSamples READ getNumSamples NOTIFY dirty())
+ Q_PROPERTY(float resolutionScale WRITE setResolutionScale READ getResolutionScale NOTIFY dirty)
+ Q_PROPERTY(int numSamples WRITE setNumSamples READ getNumSamples NOTIFY dirty)
public:
float getResolutionScale() const { return resolutionScale; }
void setResolutionScale(float scale);
diff --git a/libraries/task/src/task/Config.h b/libraries/task/src/task/Config.h
index 193674d152..8accba9e1f 100644
--- a/libraries/task/src/task/Config.h
+++ b/libraries/task/src/task/Config.h
@@ -133,8 +133,6 @@ public:
*/
Q_INVOKABLE void load(const QVariantMap& map) { qObjectFromJsonValue(QJsonObject::fromVariantMap(map), *this); emit loaded(); }
- //Q_INVOKABLE QObject* getConfig(const QString& name) { return nullptr; }
-
// Running Time measurement
// The new stats signal is emitted once per run time of a job when stats (cpu runtime) are updated
void setCPURunTime(const std::chrono::nanoseconds& runtime) { _msCPURunTime = std::chrono::duration<double, std::milli>(runtime).count(); emit newStats(); }
diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index 4d346480b6..0ee458f3ea 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -261,7 +261,6 @@ public:
_jobs.emplace_back((NT::JobModel::create(name, input, std::forward<NA>(args)...)));
// Conect the child config to this task's config
- // std::static_pointer_cast<TaskConfig>(Concept::getConfiguration())->connectChildConfig(_jobs.back().getConfiguration(), name);
std::static_pointer_cast<JobConfig>(Concept::getConfiguration())->connectChildConfig(_jobs.back().getConfiguration(), name);
return _jobs.back().getOutput();
diff --git a/scripts/developer/utilities/render/luci2.js b/scripts/developer/utilities/render/luci2.js
index ba0215569a..a34cf88415 100644
--- a/scripts/developer/utilities/render/luci2.js
+++ b/scripts/developer/utilities/render/luci2.js
@@ -69,8 +69,8 @@ function openView() {
}
pages.addPage('Luci', 'Luci', '../luci.qml', 300, 420, openLuciWindow, closeLuciWindow);
- // pages.addPage('openEngineLODView', 'Render LOD', '../lod.qml', 300, 400);
- // pages.addPage('openMaterialInspectorView', 'Material Inspector', '../materialInspector.qml', 300, 400, MaterialInspector.setWindow, MaterialInspector.setWindow);
+ pages.addPage('openEngineLODView', 'Render LOD', '../lod.qml', 300, 400);
+ pages.addPage('openMaterialInspectorView', 'Material Inspector', '../materialInspector.qml', 300, 400, MaterialInspector.setWindow, MaterialInspector.setWindow);
pages.open('Luci');