mirror of
https://github.com/Armored-Dragon/overte.git
synced 2025-03-11 16:13:16 +01:00
cleaning up
This commit is contained in:
parent
458b3f18df
commit
0cd532a47b
5 changed files with 6 additions and 8 deletions
|
@ -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({{
|
||||
|
|
|
@ -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 ()
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -107,4 +107,4 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In
|
|||
args->_viewport = destViewport;
|
||||
|
||||
output = resampledFramebuffer;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue