Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qtquick3d
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andy Nichols
qtquick3d
Commits
803bce1e
Commit
803bce1e
authored
5 years ago
by
Andy Nichols
Browse files
Options
Downloads
Patches
Plain Diff
Re-add performance debugging env variables
parent
54b033d1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#3502
passed
5 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/quick3d/qdemonscenerenderer.cpp
+49
-0
49 additions, 0 deletions
src/quick3d/qdemonscenerenderer.cpp
with
49 additions
and
0 deletions
src/quick3d/qdemonscenerenderer.cpp
+
49
−
0
View file @
803bce1e
...
@@ -15,6 +15,10 @@
...
@@ -15,6 +15,10 @@
QT_BEGIN_NAMESPACE
QT_BEGIN_NAMESPACE
static
bool
dumpPerfTiming
=
false
;
static
int
frameCount
=
0
;
static
bool
dumpRenderTimes
=
false
;
SGFramebufferObjectNode
::
SGFramebufferObjectNode
()
SGFramebufferObjectNode
::
SGFramebufferObjectNode
()
:
window
(
nullptr
)
:
window
(
nullptr
)
,
renderer
(
nullptr
)
,
renderer
(
nullptr
)
...
@@ -51,6 +55,8 @@ void SGFramebufferObjectNode::preprocess()
...
@@ -51,6 +55,8 @@ void SGFramebufferObjectNode::preprocess()
void
SGFramebufferObjectNode
::
render
()
void
SGFramebufferObjectNode
::
render
()
{
{
if
(
renderPending
)
{
if
(
renderPending
)
{
QElapsedTimer
renderTimer
;
renderTimer
.
start
();
renderPending
=
false
;
renderPending
=
false
;
GLuint
textureId
=
renderer
->
render
();
GLuint
textureId
=
renderer
->
render
();
...
@@ -66,6 +72,10 @@ void SGFramebufferObjectNode::render()
...
@@ -66,6 +72,10 @@ void SGFramebufferObjectNode::render()
markDirty
(
QSGNode
::
DirtyMaterial
);
markDirty
(
QSGNode
::
DirtyMaterial
);
emit
textureChanged
();
emit
textureChanged
();
if
(
dumpRenderTimes
)
{
QOpenGLContext
::
currentContext
()
->
functions
()
->
glFinish
();
qDebug
()
<<
"FBO: Render took: "
<<
renderTimer
.
elapsed
()
<<
"ms"
;
}
}
}
}
}
...
@@ -77,6 +87,7 @@ void SGFramebufferObjectNode::handleScreenChange()
...
@@ -77,6 +87,7 @@ void SGFramebufferObjectNode::handleScreenChange()
}
}
}
}
QDemonSceneRenderer
::
QDemonSceneRenderer
(
QWindow
*
window
)
QDemonSceneRenderer
::
QDemonSceneRenderer
(
QWindow
*
window
)
:
m_window
(
window
)
:
m_window
(
window
)
{
{
...
@@ -94,6 +105,11 @@ QDemonSceneRenderer::QDemonSceneRenderer(QWindow *window)
...
@@ -94,6 +105,11 @@ QDemonSceneRenderer::QDemonSceneRenderer(QWindow *window)
m_renderContext
=
QDemonRenderContext
::
createGl
(
openGLContext
->
format
());
m_renderContext
=
QDemonRenderContext
::
createGl
(
openGLContext
->
format
());
if
(
m_sgContext
.
isNull
())
if
(
m_sgContext
.
isNull
())
m_sgContext
=
QDemonRenderContextInterface
::
getRenderContextInterface
(
m_renderContext
,
QString
::
fromLatin1
(
"./"
),
quintptr
(
window
));
m_sgContext
=
QDemonRenderContextInterface
::
getRenderContextInterface
(
m_renderContext
,
QString
::
fromLatin1
(
"./"
),
quintptr
(
window
));
dumpPerfTiming
=
!
qgetenv
(
"QUICK3D_PERFTIMERS"
).
isEmpty
();
dumpRenderTimes
=
!
qgetenv
(
"QUICK3D_RENDERTIMES"
).
isEmpty
();
if
(
dumpPerfTiming
)
m_sgContext
->
renderer
()
->
enableLayerGpuProfiling
(
true
);
}
}
QDemonSceneRenderer
::~
QDemonSceneRenderer
()
QDemonSceneRenderer
::~
QDemonSceneRenderer
()
...
@@ -116,6 +132,13 @@ GLuint QDemonSceneRenderer::render()
...
@@ -116,6 +132,13 @@ GLuint QDemonSceneRenderer::render()
m_sgContext
->
renderer
()
->
renderLayer
(
*
m_layer
,
m_surfaceSize
,
true
,
QVector3D
(
0
,
0
,
0
),
false
);
m_sgContext
->
renderer
()
->
renderLayer
(
*
m_layer
,
m_surfaceSize
,
true
,
QVector3D
(
0
,
0
,
0
),
false
);
m_sgContext
->
endFrame
();
m_sgContext
->
endFrame
();
if
(
dumpPerfTiming
)
{
if
(
++
frameCount
==
60
)
{
m_sgContext
->
performanceTimer
()
->
dump
();
frameCount
=
0
;
}
}
return
HandleToID_cast
(
GLuint
,
size_t
,
m_fbo
->
color0
->
handle
());
return
HandleToID_cast
(
GLuint
,
size_t
,
m_fbo
->
color0
->
handle
());
}
}
...
@@ -139,6 +162,12 @@ void QDemonSceneRenderer::render(const QRect &viewport, bool clearFirst)
...
@@ -139,6 +162,12 @@ void QDemonSceneRenderer::render(const QRect &viewport, bool clearFirst)
m_sgContext
->
renderer
()
->
renderLayer
(
*
m_layer
,
m_surfaceSize
,
clearFirst
,
QVector3D
(
0
,
0
,
0
),
false
);
m_sgContext
->
renderer
()
->
renderLayer
(
*
m_layer
,
m_surfaceSize
,
clearFirst
,
QVector3D
(
0
,
0
,
0
),
false
);
m_sgContext
->
endFrame
();
m_sgContext
->
endFrame
();
if
(
dumpPerfTiming
)
{
if
(
++
frameCount
==
60
)
{
m_sgContext
->
performanceTimer
()
->
dump
();
frameCount
=
0
;
}
}
}
}
void
QDemonSceneRenderer
::
synchronize
(
QDemonView3D
*
item
,
const
QSize
&
size
,
bool
useFBO
)
void
QDemonSceneRenderer
::
synchronize
(
QDemonView3D
*
item
,
const
QSize
&
size
,
bool
useFBO
)
...
@@ -146,6 +175,9 @@ void QDemonSceneRenderer::synchronize(QDemonView3D *item, const QSize &size, boo
...
@@ -146,6 +175,9 @@ void QDemonSceneRenderer::synchronize(QDemonView3D *item, const QSize &size, boo
if
(
!
item
)
if
(
!
item
)
return
;
return
;
QElapsedTimer
syncTimer
;
syncTimer
.
start
();
if
(
m_surfaceSize
!=
size
)
{
if
(
m_surfaceSize
!=
size
)
{
m_layerSizeIsDirty
=
true
;
m_layerSizeIsDirty
=
true
;
m_surfaceSize
=
size
;
m_surfaceSize
=
size
;
...
@@ -201,6 +233,10 @@ void QDemonSceneRenderer::synchronize(QDemonView3D *item, const QSize &size, boo
...
@@ -201,6 +233,10 @@ void QDemonSceneRenderer::synchronize(QDemonView3D *item, const QSize &size, boo
m_layerSizeIsDirty
=
false
;
m_layerSizeIsDirty
=
false
;
}
}
}
}
if
(
dumpRenderTimes
)
{
QOpenGLContext
::
currentContext
()
->
functions
()
->
glFinish
();
qDebug
()
<<
"Sync took "
<<
syncTimer
.
elapsed
()
<<
"ms"
;
}
}
}
...
@@ -339,6 +375,8 @@ QRect convertQtRectToGLViewport(const QRectF &rect, const QSize surfaceSize) {
...
@@ -339,6 +375,8 @@ QRect convertQtRectToGLViewport(const QRectF &rect, const QSize surfaceSize) {
void
QDemonSGRenderNode
::
render
(
const
QSGRenderNode
::
RenderState
*
state
)
void
QDemonSGRenderNode
::
render
(
const
QSGRenderNode
::
RenderState
*
state
)
{
{
QElapsedTimer
renderTimer
;
renderTimer
.
start
();
// calculate viewport
// calculate viewport
const
double
dpr
=
renderer
->
m_window
->
devicePixelRatio
();
const
double
dpr
=
renderer
->
m_window
->
devicePixelRatio
();
const
QSizeF
itemSize
=
renderer
->
surfaceSize
()
/
dpr
;
const
QSizeF
itemSize
=
renderer
->
surfaceSize
()
/
dpr
;
...
@@ -352,6 +390,11 @@ void QDemonSGRenderNode::render(const QSGRenderNode::RenderState *state)
...
@@ -352,6 +390,11 @@ void QDemonSGRenderNode::render(const QSGRenderNode::RenderState *state)
// reset some state
// reset some state
window
->
resetOpenGLState
();
window
->
resetOpenGLState
();
if
(
dumpRenderTimes
)
{
QOpenGLContext
::
currentContext
()
->
functions
()
->
glFinish
();
qDebug
()
<<
"SGRenderNode: Render took: "
<<
renderTimer
.
elapsed
()
<<
"ms"
;
}
}
}
void
QDemonSGRenderNode
::
releaseResources
()
void
QDemonSGRenderNode
::
releaseResources
()
...
@@ -391,9 +434,15 @@ void QDemonSGDirectRenderer::requestRender()
...
@@ -391,9 +434,15 @@ void QDemonSGDirectRenderer::requestRender()
void
QDemonSGDirectRenderer
::
render
()
void
QDemonSGDirectRenderer
::
render
()
{
{
QElapsedTimer
renderTimer
;
renderTimer
.
start
();
const
QRect
glViewport
=
convertQtRectToGLViewport
(
m_viewport
,
m_window
->
size
()
*
m_window
->
devicePixelRatio
());
const
QRect
glViewport
=
convertQtRectToGLViewport
(
m_viewport
,
m_window
->
size
()
*
m_window
->
devicePixelRatio
());
m_renderer
->
render
(
glViewport
,
false
);
m_renderer
->
render
(
glViewport
,
false
);
m_window
->
resetOpenGLState
();
m_window
->
resetOpenGLState
();
if
(
dumpRenderTimes
)
{
QOpenGLContext
::
currentContext
()
->
functions
()
->
glFinish
();
qDebug
()
<<
"Window: Render took: "
<<
renderTimer
.
elapsed
()
<<
"ms"
;
}
}
}
QT_END_NAMESPACE
QT_END_NAMESPACE
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment