Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-13 20:49:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

REmoving problematic timers for mac

Browse source
This commit is contained in:
samcake 2016-07-17 18:32:43 -07:00
parent 9332f82d54
commit cfa51ae1f5
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/gpu-gl/src/gpu/gl/GLBackendQuery.cpp
View file

@ -15,7 +15,11 @@ using namespace gpu;
using namespace gpu::gl; using namespace gpu::gl;
// Eventually, we want to test with TIME_ELAPSED instead of TIMESTAMP // Eventually, we want to test with TIME_ELAPSED instead of TIMESTAMP
#ifdef Q_OS_MAC
static bool timeElapsed = true;
#else
static bool timeElapsed = false; static bool timeElapsed = false;
#endif
void GLBackend::do_beginQuery(Batch& batch, size_t paramOffset) { void GLBackend::do_beginQuery(Batch& batch, size_t paramOffset) {
auto query = batch._queries.get(batch._params[paramOffset]._uint); auto query = batch._queries.get(batch._params[paramOffset]._uint);

4
libraries/render-utils/src/RenderDeferredTask.cpp
View file

@ -100,7 +100,7 @@ RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) {
// GPU jobs: Start preparing the primary, deferred and lighting buffer // GPU jobs: Start preparing the primary, deferred and lighting buffer
const auto primaryFramebuffer = addJob<PreparePrimaryFramebuffer>("PreparePrimaryBuffer"); const auto primaryFramebuffer = addJob<PreparePrimaryFramebuffer>("PreparePrimaryBuffer");
const auto fullFrameRangeTimer = addJob<BeginGPURangeTimer>("BeginRangeTimer"); // const auto fullFrameRangeTimer = addJob<BeginGPURangeTimer>("BeginRangeTimer");
const auto opaqueRangeTimer = addJob<BeginGPURangeTimer>("BeginOpaqueRangeTimer"); const auto opaqueRangeTimer = addJob<BeginGPURangeTimer>("BeginOpaqueRangeTimer");
const auto prepareDeferredInputs = PrepareDeferred::Inputs(primaryFramebuffer, lightingModel).hasVarying(); const auto prepareDeferredInputs = PrepareDeferred::Inputs(primaryFramebuffer, lightingModel).hasVarying();
@ -209,7 +209,7 @@ RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) {
// Blit! // Blit!
addJob<Blit>("Blit", primaryFramebuffer); addJob<Blit>("Blit", primaryFramebuffer);
addJob<EndGPURangeTimer>("RangeTimer", fullFrameRangeTimer); // addJob<EndGPURangeTimer>("RangeTimer", fullFrameRangeTimer);
} }

6
scripts/developer/utilities/render/statsGPU.qml
View file

@ -72,12 +72,6 @@ Item {
label: "tone and post", label: "tone and post",
color: "#FF0000" color: "#FF0000"
} }
,{
object: Render.getConfig("RangeTimer"),
prop: "gpuTime",
label: "FrameGPU",
color: "#FFFF00"
}
] ]
} }
} }