mirror of
https://github.com/overte-org/overte.git
synced 2025-08-04 04:23:33 +02:00
Merge pull request #15844 from annabrewer/color-banding
BUGZ-828: Color banding showing up in recent builds
This commit is contained in:
commit
a3d6dd2623
4 changed files with 7 additions and 13 deletions
|
@ -174,6 +174,10 @@ float HmdDisplayPlugin::getLeftCenterPixel() const {
|
||||||
return leftCenterPixel;
|
return leftCenterPixel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gpu::PipelinePointer HmdDisplayPlugin::getRenderTexturePipeline() {
|
||||||
|
return _SRGBToLinearPipeline;
|
||||||
|
}
|
||||||
|
|
||||||
void HmdDisplayPlugin::internalPresent() {
|
void HmdDisplayPlugin::internalPresent() {
|
||||||
PROFILE_RANGE_EX(render, __FUNCTION__, 0xff00ff00, (uint64_t)presentCount())
|
PROFILE_RANGE_EX(render, __FUNCTION__, 0xff00ff00, (uint64_t)presentCount())
|
||||||
|
|
||||||
|
|
|
@ -51,6 +51,8 @@ public:
|
||||||
std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator() override;
|
std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator() override;
|
||||||
virtual StencilMaskMode getStencilMaskMode() const override { return StencilMaskMode::PAINT; }
|
virtual StencilMaskMode getStencilMaskMode() const override { return StencilMaskMode::PAINT; }
|
||||||
|
|
||||||
|
virtual gpu::PipelinePointer getRenderTexturePipeline() override;
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void hmdMountedChanged();
|
void hmdMountedChanged();
|
||||||
void hmdVisibleChanged(bool visible);
|
void hmdVisibleChanged(bool visible);
|
||||||
|
|
|
@ -124,15 +124,6 @@ void OculusDisplayPlugin::uncustomizeContext() {
|
||||||
Parent::uncustomizeContext();
|
Parent::uncustomizeContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
gpu::PipelinePointer OculusDisplayPlugin::getRenderTexturePipeline() {
|
|
||||||
//return _SRGBToLinearPipeline;
|
|
||||||
return _drawTexturePipeline;
|
|
||||||
}
|
|
||||||
|
|
||||||
gpu::PipelinePointer OculusDisplayPlugin::getCompositeScenePipeline() {
|
|
||||||
return _SRGBToLinearPipeline;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const uint64_t FRAME_BUDGET = (11 * USECS_PER_MSEC);
|
static const uint64_t FRAME_BUDGET = (11 * USECS_PER_MSEC);
|
||||||
static const uint64_t FRAME_OVER_BUDGET = (15 * USECS_PER_MSEC);
|
static const uint64_t FRAME_OVER_BUDGET = (15 * USECS_PER_MSEC);
|
||||||
|
|
||||||
|
@ -172,7 +163,7 @@ void OculusDisplayPlugin::hmdPresent() {
|
||||||
batch.setStateScissorRect(ivec4(uvec2(), _outputFramebuffer->getSize()));
|
batch.setStateScissorRect(ivec4(uvec2(), _outputFramebuffer->getSize()));
|
||||||
batch.resetViewTransform();
|
batch.resetViewTransform();
|
||||||
batch.setProjectionTransform(mat4());
|
batch.setProjectionTransform(mat4());
|
||||||
batch.setPipeline(_drawTexturePipeline);
|
batch.setPipeline(_SRGBToLinearPipeline);
|
||||||
batch.setResourceTexture(0, _compositeFramebuffer->getRenderBuffer(0));
|
batch.setResourceTexture(0, _compositeFramebuffer->getRenderBuffer(0));
|
||||||
batch.draw(gpu::TRIANGLE_STRIP, 4);
|
batch.draw(gpu::TRIANGLE_STRIP, 4);
|
||||||
});
|
});
|
||||||
|
|
|
@ -24,9 +24,6 @@ public:
|
||||||
|
|
||||||
virtual QJsonObject getHardwareStats() const;
|
virtual QJsonObject getHardwareStats() const;
|
||||||
|
|
||||||
virtual gpu::PipelinePointer getRenderTexturePipeline() override;
|
|
||||||
virtual gpu::PipelinePointer getCompositeScenePipeline() override;
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
QThread::Priority getPresentPriority() override { return QThread::TimeCriticalPriority; }
|
QThread::Priority getPresentPriority() override { return QThread::TimeCriticalPriority; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue