Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned

Browse source
This commit is contained in:
samcake 2016-03-30 15:07:45 -07:00
parent f09593e106
commit 6213e0859d
5 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
examples/utilities/render/stats.qml
View file

@ -122,13 +122,13 @@ Item {
plots: [ plots: [
{ {
prop: "frameTriangleCount", prop: "frameTriangleCount",
label: "Frame", label: "Triangles",
color: "#E2334D" color: "#1AC567"
}, },
{ {
prop: "frameTriangleRate", prop: "frameTriangleRate",
label: "rate", label: "rate",
color: "#1AC567", color: "#E2334D",
scale: 0.001, scale: 0.001,
unit: "MT/s" unit: "MT/s"
} }
@ -140,15 +140,20 @@ Item {
object: stats.config object: stats.config
trigger: stats.config["frameDrawcallCount"] trigger: stats.config["frameDrawcallCount"]
plots: [ plots: [
{
prop: "frameAPIDrawcallCount",
label: "API Drawcalls",
color: "#00B4EF"
},
{ {
prop: "frameDrawcallCount", prop: "frameDrawcallCount",
label: "Frame", label: "GPU Drawcalls",
color: "#E2334D" color: "#1AC567"
}, },
{ {
prop: "frameDrawcallRate", prop: "frameDrawcallRate",
label: "rate", label: "rate",
color: "#1AC567", color: "#E2334D",
scale: 0.001, scale: 0.001,
unit: "K/s" unit: "K/s"
} }

1
libraries/gpu/src/gpu/Context.h
View file

@ -35,6 +35,7 @@ public:
int _RSNumTextureBounded = 0; int _RSNumTextureBounded = 0;
int _DSNumAPIDrawcalls = 0;
int _DSNumDrawcalls = 0; int _DSNumDrawcalls = 0;
int _DSNumTriangles = 0; int _DSNumTriangles = 0;

8
libraries/gpu/src/gpu/GLBackend.cpp
View file

@ -326,6 +326,7 @@ void GLBackend::do_draw(Batch& batch, size_t paramOffset) {
glDrawArrays(mode, startVertex, numVertices); glDrawArrays(mode, startVertex, numVertices);
_stats._DSNumTriangles += numVertices / 3; _stats._DSNumTriangles += numVertices / 3;
_stats._DSNumDrawcalls++; _stats._DSNumDrawcalls++;
_stats._DSNumAPIDrawcalls++;
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }
@ -344,6 +345,7 @@ void GLBackend::do_drawIndexed(Batch& batch, size_t paramOffset) {
glDrawElements(mode, numIndices, glType, indexBufferByteOffset); glDrawElements(mode, numIndices, glType, indexBufferByteOffset);
_stats._DSNumTriangles += numIndices / 3; _stats._DSNumTriangles += numIndices / 3;
_stats._DSNumDrawcalls++; _stats._DSNumDrawcalls++;
_stats._DSNumAPIDrawcalls++;
(void) CHECK_GL_ERROR(); (void) CHECK_GL_ERROR();
} }
@ -358,6 +360,7 @@ void GLBackend::do_drawInstanced(Batch& batch, size_t paramOffset) {
glDrawArraysInstancedARB(mode, startVertex, numVertices, numInstances); glDrawArraysInstancedARB(mode, startVertex, numVertices, numInstances);
_stats._DSNumTriangles += (numInstances * numVertices) / 3; _stats._DSNumTriangles += (numInstances * numVertices) / 3;
_stats._DSNumDrawcalls += numInstances; _stats._DSNumDrawcalls += numInstances;
_stats._DSNumAPIDrawcalls++;
(void) CHECK_GL_ERROR(); (void) CHECK_GL_ERROR();
} }
@ -383,6 +386,7 @@ void GLBackend::do_drawIndexedInstanced(Batch& batch, size_t paramOffset) {
#endif #endif
_stats._DSNumTriangles += (numInstances * numIndices) / 3; _stats._DSNumTriangles += (numInstances * numIndices) / 3;
_stats._DSNumDrawcalls += numInstances; _stats._DSNumDrawcalls += numInstances;
_stats._DSNumAPIDrawcalls++;
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }
@ -395,6 +399,8 @@ void GLBackend::do_multiDrawIndirect(Batch& batch, size_t paramOffset) {
glMultiDrawArraysIndirect(mode, reinterpret_cast<GLvoid*>(_input._indirectBufferOffset), commandCount, (GLsizei)_input._indirectBufferStride); glMultiDrawArraysIndirect(mode, reinterpret_cast<GLvoid*>(_input._indirectBufferOffset), commandCount, (GLsizei)_input._indirectBufferStride);
_stats._DSNumDrawcalls += commandCount; _stats._DSNumDrawcalls += commandCount;
_stats._DSNumAPIDrawcalls++;
#else #else
// FIXME implement the slow path // FIXME implement the slow path
#endif #endif
@ -410,7 +416,7 @@ void GLBackend::do_multiDrawIndexedIndirect(Batch& batch, size_t paramOffset) {
glMultiDrawElementsIndirect(mode, indexType, reinterpret_cast<GLvoid*>(_input._indirectBufferOffset), commandCount, (GLsizei)_input._indirectBufferStride); glMultiDrawElementsIndirect(mode, indexType, reinterpret_cast<GLvoid*>(_input._indirectBufferOffset), commandCount, (GLsizei)_input._indirectBufferStride);
_stats._DSNumDrawcalls += commandCount; _stats._DSNumDrawcalls += commandCount;
_stats._DSNumAPIDrawcalls++;
#else #else
// FIXME implement the slow path // FIXME implement the slow path
#endif #endif

1
libraries/render/src/render/EngineStats.cpp
View file

@ -36,6 +36,7 @@ void EngineStats::run(const SceneContextPointer& sceneContext, const RenderConte
gpu::ContextStats gpuStats(_gpuStats); gpu::ContextStats gpuStats(_gpuStats);
renderContext->args->_context->getStats(_gpuStats); renderContext->args->_context->getStats(_gpuStats);
config->frameAPIDrawcallCount = _gpuStats._DSNumAPIDrawcalls - gpuStats._DSNumAPIDrawcalls;
config->frameDrawcallCount = _gpuStats._DSNumDrawcalls - gpuStats._DSNumDrawcalls; config->frameDrawcallCount = _gpuStats._DSNumDrawcalls - gpuStats._DSNumDrawcalls;
config->frameDrawcallRate = config->frameDrawcallCount * frequency; config->frameDrawcallRate = config->frameDrawcallCount * frequency;

2
libraries/render/src/render/EngineStats.h
View file

@ -34,6 +34,7 @@ namespace render {
Q_PROPERTY(qint64 textureCPUMemoryUsage MEMBER textureCPUMemoryUsage NOTIFY dirty) Q_PROPERTY(qint64 textureCPUMemoryUsage MEMBER textureCPUMemoryUsage NOTIFY dirty)
Q_PROPERTY(qint64 textureGPUMemoryUsage MEMBER textureGPUMemoryUsage NOTIFY dirty) Q_PROPERTY(qint64 textureGPUMemoryUsage MEMBER textureGPUMemoryUsage NOTIFY dirty)
Q_PROPERTY(quint32 frameAPIDrawcallCount MEMBER frameAPIDrawcallCount NOTIFY dirty)
Q_PROPERTY(quint32 frameDrawcallCount MEMBER frameDrawcallCount NOTIFY dirty) Q_PROPERTY(quint32 frameDrawcallCount MEMBER frameDrawcallCount NOTIFY dirty)
Q_PROPERTY(quint32 frameDrawcallRate MEMBER frameDrawcallRate NOTIFY dirty) Q_PROPERTY(quint32 frameDrawcallRate MEMBER frameDrawcallRate NOTIFY dirty)
@ -57,6 +58,7 @@ namespace render {
qint64 textureCPUMemoryUsage{ 0 }; qint64 textureCPUMemoryUsage{ 0 };
qint64 textureGPUMemoryUsage{ 0 }; qint64 textureGPUMemoryUsage{ 0 };
quint32 frameAPIDrawcallCount{ 0 };
quint32 frameDrawcallCount{ 0 }; quint32 frameDrawcallCount{ 0 };
quint32 frameDrawcallRate{ 0 }; quint32 frameDrawcallRate{ 0 };