diff --git a/libraries/platform/src/platform/backend/PlatformInstance.cpp b/libraries/platform/src/platform/backend/PlatformInstance.cpp index 2f68972c4a..e02eaf2837 100644 --- a/libraries/platform/src/platform/backend/PlatformInstance.cpp +++ b/libraries/platform/src/platform/backend/PlatformInstance.cpp @@ -104,6 +104,7 @@ void Instance::enumerateNics() { } } } + json Instance::getCPU(int index) { assert(index < (int)_cpus.size()); @@ -146,7 +147,6 @@ Instance::~Instance() { } } - json Instance::listAllKeys() { json allKeys; allKeys.array({{ diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt index 4fbd076d05..833d78bb74 100644 --- a/libraries/render-utils/CMakeLists.txt +++ b/libraries/render-utils/CMakeLists.txt @@ -12,9 +12,7 @@ include_hifi_library_headers(hfm) # tell CMake to exclude qrc_fonts.cpp for policy CMP0071 set_property(SOURCE qrc_fonts.cpp PROPERTY SKIP_AUTOMOC ON) -if (ANDROID) - target_link_libraries(${TARGET_NAME} android log) -else() +if (NOT ANDROID) target_nsight() endif () diff --git a/libraries/render-utils/src/RenderCommonTask.cpp b/libraries/render-utils/src/RenderCommonTask.cpp index 9338cefa82..bdcba3e931 100644 --- a/libraries/render-utils/src/RenderCommonTask.cpp +++ b/libraries/render-utils/src/RenderCommonTask.cpp @@ -154,7 +154,6 @@ void NewFramebuffer::run(const render::RenderContextPointer& renderContext, cons glm::uvec2 frameSize(args->_viewport.z, args->_viewport.w); output.reset(); - // Else use the lodal Framebuffer if (_outputFramebuffer && _outputFramebuffer->getSize() != frameSize) { _outputFramebuffer.reset(); } diff --git a/libraries/render-utils/src/ToneMapAndResampleTask.cpp b/libraries/render-utils/src/ToneMapAndResampleTask.cpp index d9439f7a92..54821b0380 100644 --- a/libraries/render-utils/src/ToneMapAndResampleTask.cpp +++ b/libraries/render-utils/src/ToneMapAndResampleTask.cpp @@ -107,4 +107,4 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In args->_viewport = destViewport; output = resampledFramebuffer; -} \ No newline at end of file +} diff --git a/libraries/render-utils/src/ToneMapAndResampleTask.h b/libraries/render-utils/src/ToneMapAndResampleTask.h index d2b166392e..1c7ef2cf48 100644 --- a/libraries/render-utils/src/ToneMapAndResampleTask.h +++ b/libraries/render-utils/src/ToneMapAndResampleTask.h @@ -32,6 +32,7 @@ class ToneMappingConfig : public render::Job::Config { Q_OBJECT Q_PROPERTY(float exposure MEMBER exposure WRITE setExposure); Q_PROPERTY(int curve MEMBER curve WRITE setCurve); + public: ToneMappingConfig() : render::Job::Config(true) {} @@ -41,6 +42,7 @@ public: float exposure{ 0.0f }; int curve{ (int)ToneCurve::Gamma22 }; + signals: void dirty(); }; @@ -68,7 +70,6 @@ public: void run(const render::RenderContextPointer& renderContext, const Input& input, Output& output); protected: - static gpu::PipelinePointer _pipeline; static gpu::PipelinePointer _mirrorPipeline; @@ -79,7 +80,6 @@ protected: gpu::FramebufferPointer getResampledFrameBuffer(const gpu::FramebufferPointer& sourceFramebuffer); private: - gpu::PipelinePointer _blitLightBuffer; // Class describing the uniform buffer with all the parameters common to the tone mapping shaders @@ -93,6 +93,7 @@ private: Parameters() {} }; + typedef gpu::BufferView UniformBufferView; gpu::BufferView _parametersBuffer;