whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with -no-feature-thread 

Change-Id: I7158f92faa1d6b3b0fe6322998682b825af908be
Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Tasuku Suzuki 2023-08-17 11:46:53 +09:00
parent 9218c8f4ea
commit b77e1de2ba
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/util/qgraphicsframecapturerenderdoc.cpp
View File

@ -15,7 +15,9 @@ QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcGraphicsFrameCapture, "qt.gui.graphicsframecapture")
RENDERDOC_API_1_6_0 *QGraphicsFrameCaptureRenderDoc::s_rdocApi = nullptr;
#if QT_CONFIG(thread)
QBasicMutex QGraphicsFrameCaptureRenderDoc::s_frameCaptureMutex;
#endif
static void *glNativeContext(QOpenGLContext *context) {
void *nctx = nullptr;
@ -166,8 +168,10 @@ void QGraphicsFrameCaptureRenderDoc::startCaptureFrame()
return;
}
#if QT_CONFIG(thread)
// There is a single instance of RenderDoc library and it needs mutex for multithreading access.
QMutexLocker locker(&s_frameCaptureMutex);
#endif
if (s_rdocApi->IsFrameCapturing()) {
qCWarning(lcGraphicsFrameCapture) << "A frame capture is already in progress, "
"will not initiate another one until"
@ -195,8 +199,10 @@ void QGraphicsFrameCaptureRenderDoc::endCaptureFrame()
return;
}
#if QT_CONFIG(thread)
// There is a single instance of RenderDoc library and it needs mutex for multithreading access.
QMutexLocker locker(&s_frameCaptureMutex);
#endif
if (!s_rdocApi->IsFrameCapturing()) {
qCWarning(lcGraphicsFrameCapture) << "A call to QGraphicsFrameCapture::endCaptureFrame can not be done"
" without a call to QGraphicsFrameCapture::startCaptureFrame";
@ -247,8 +253,10 @@ void QGraphicsFrameCaptureRenderDoc::openCapture()
return;
}
#if QT_CONFIG(thread)
// There is a single instance of RenderDoc library and it needs mutex for multithreading access.
QMutexLocker locker(&s_frameCaptureMutex);
#endif
if (s_rdocApi->IsTargetControlConnected())
s_rdocApi->ShowReplayUI();
else
@ -257,9 +265,10 @@ void QGraphicsFrameCaptureRenderDoc::openCapture()
void QGraphicsFrameCaptureRenderDoc::init()
{
#if QT_CONFIG(thread)
// There is a single instance of RenderDoc library and it needs mutex for multithreading access.
QMutexLocker locker(&s_frameCaptureMutex);
#endif
QLibrary renderDocLib(QStringLiteral("renderdoc"));
pRENDERDOC_GetAPI RENDERDOC_GetAPI = (pRENDERDOC_GetAPI) renderDocLib.resolve("RENDERDOC_GetAPI");

4
src/gui/util/qgraphicsframecapturerenderdoc_p_p.h
View File

@ -21,7 +21,9 @@
QT_BEGIN_NAMESPACE
#if QT_CONFIG(thread)
class QBasicMutex;
#endif
class QGraphicsFrameCaptureRenderDoc : public QGraphicsFrameCapturePrivate
{
@ -40,7 +42,9 @@ private:
void init();
void updateCapturePathAndTemplate();
static RENDERDOC_API_1_5_0 *s_rdocApi;
#if QT_CONFIG(thread)
static QBasicMutex s_frameCaptureMutex;
#endif
bool m_nativeHandlesSet;
};