Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Laszlo Agocs
qtrhi
Commits
191c8f41
Commit
191c8f41
authored
Jan 06, 2019
by
Laszlo Agocs
Browse files
Add DebugMarkers to feature enum
parent
e6bb11ff
Changes
7
Hide whitespace changes
Inline
Side-by-side
examples/rhi/triquadcube/triquadcube.cpp
View file @
191c8f41
...
...
@@ -146,6 +146,7 @@ void Window::customInit()
// Check some features/limits.
qDebug
(
"isFeatureSupported(MultisampleTexture): %d"
,
m_r
->
isFeatureSupported
(
QRhi
::
MultisampleTexture
));
qDebug
(
"isFeatureSupported(MultisampleRenderBuffer): %d"
,
m_r
->
isFeatureSupported
(
QRhi
::
MultisampleRenderBuffer
));
qDebug
(
"isFeatureSupported(DebugMarkers): %d"
,
m_r
->
isFeatureSupported
(
QRhi
::
DebugMarkers
));
qDebug
(
"Min 2D texture width/height: %d"
,
m_r
->
resourceSizeLimit
(
QRhi
::
TextureSizeMin
));
qDebug
(
"Max 2D texture width/height: %d"
,
m_r
->
resourceSizeLimit
(
QRhi
::
TextureSizeMax
));
}
...
...
src/rhi/qrhi.h
View file @
191c8f41
...
...
@@ -365,8 +365,9 @@ public:
virtual
void
release
()
=
0
;
void
releaseAndDestroy
();
// May be ignored unless EnableDebugMarkers is set.
// May also be ignored for some objects, depending on the backend.
// Ignored when DebugMarkers are not supported or EnableDebugMarkers is not
// set. May also be ignored for objects other than buffers, renderbuffers, and
// textures, depending on the backend.
QByteArray
name
()
const
;
void
setName
(
const
QByteArray
&
name
);
...
...
@@ -992,8 +993,7 @@ public:
qint32
vertexOffset
=
0
,
quint32
firstInstance
=
0
);
// Ignored when EnableDebugMarkers is not set.
// May be silently ignored with some backends.
// Ignored when DebugMarkers are not supported or EnableDebugMarkers is not set.
void
debugMarkBegin
(
const
QByteArray
&
name
);
void
debugMarkEnd
();
// With some backends debugMarkMsg is only supported inside a pass and is
...
...
@@ -1113,7 +1113,8 @@ public:
enum
Feature
{
MultisampleTexture
=
1
,
MultisampleRenderBuffer
MultisampleRenderBuffer
,
DebugMarkers
};
enum
ResourceSizeLimit
{
...
...
src/rhi/qrhid3d11.cpp
View file @
191c8f41
...
...
@@ -261,6 +261,8 @@ bool QRhiD3D11::isFeatureSupported(QRhi::Feature feature) const
Q_FALLTHROUGH
();
case
QRhi
::
MultisampleRenderBuffer
:
return
true
;
case
QRhi
::
DebugMarkers
:
return
annotations
!=
nullptr
;
default:
Q_UNREACHABLE
();
return
false
;
...
...
src/rhi/qrhigles2.cpp
View file @
191c8f41
...
...
@@ -263,6 +263,8 @@ bool QRhiGles2::isFeatureSupported(QRhi::Feature feature) const
return
false
;
case
QRhi
::
MultisampleRenderBuffer
:
return
caps
.
msaaRenderBuffer
;
case
QRhi
::
DebugMarkers
:
return
false
;
default:
Q_UNREACHABLE
();
return
false
;
...
...
src/rhi/qrhimetal.mm
View file @
191c8f41
...
...
@@ -358,6 +358,8 @@ bool QRhiMetal::isFeatureSupported(QRhi::Feature feature) const
case
QRhi
::
MultisampleTexture
:
Q_FALLTHROUGH
();
case
QRhi
::
MultisampleRenderBuffer
:
Q_FALLTHROUGH
();
case
QRhi
::
DebugMarkers
:
return
true
;
default:
Q_UNREACHABLE
();
...
...
src/rhi/qrhivulkan.cpp
View file @
191c8f41
...
...
@@ -2661,6 +2661,8 @@ bool QRhiVulkan::isFeatureSupported(QRhi::Feature feature) const
Q_FALLTHROUGH
();
case
QRhi
::
MultisampleRenderBuffer
:
return
true
;
case
QRhi
::
DebugMarkers
:
return
debugMarkersAvailable
;
default:
Q_UNREACHABLE
();
return
false
;
...
...
todo.txt
View file @
191c8f41
d3d, vk: timestamp query
prof report api (fed by a cbor stream)
gl: debug: object names
gl: debug: markers (begin, end, msg)
prof: report readback temp buf
multiwindow_threaded should demo pulling out the device and importing to another rhi
mtl: reduce set*
...
...
@@ -46,6 +45,7 @@ multi mip/layer copy? (fewer barriers...)
multi-buffer (region) readback?
depth readback?
copy image depth?
gl: markers and object names via gl_khr_debug
shadertools:
dxc for d3d as an alternative to fxc?
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment