diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-03-16 04:16:48 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-03-23 07:02:08 +0000 |
| commit | 0abec22f157e0931ce2622bd81d536028c9dd734 (patch) | |
| tree | ff700057b38d87e6a59fdc4fe0068764df0905a9 /src/quick/scenegraph | |
| parent | e1443d4e186b8fecfb6ffb890c8780fd0552dceb (diff) | |
webassembly: revert the bitfield patch
The bitfield changes are no longer needed, as the problem with
variables becoming unchangable seems to have been fixed, or has cleared
itself up.
Change-Id: Ia681b7410922473ab26ff57894582f8386380a86
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/quick/scenegraph')
5 files changed, 0 insertions, 36 deletions
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h index 8987fb0940..c724d18298 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop_p.h @@ -87,13 +87,8 @@ public: QSGRenderContext *createRenderContext(QSGContext *) const override { return rc; } struct WindowData { -#ifndef QT_NO_BITFIELDS bool updatePending : 1; bool grabOnly : 1; -#else - bool updatePending = 1; - bool grabOnly = 1; -#endif }; QHash<QQuickWindow *, WindowData> m_windows; diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h index 8362ff54dc..d4ff6ea9fe 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h @@ -123,15 +123,9 @@ private: const QSGBindable *m_bindable; -#ifndef QT_NO_BITFIELDS uint m_changed_emitted : 1; uint m_is_rendering : 1; uint m_is_preprocessing : 1; -#else - uint m_changed_emitted = 1; - uint m_is_rendering = 1; - uint m_is_preprocessing = 1; -#endif }; class Q_QUICK_PRIVATE_EXPORT QSGBindable diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 9e5cc27cd8..8130272295 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -161,13 +161,8 @@ public: QSGRenderContext *createRenderContext(QSGContext *) const override { return rc; } struct WindowData { -#ifndef QT_NO_BITFIELDS bool updatePending : 1; bool grabOnly : 1; -#else - bool updatePending = 1; - bool grabOnly = 1; -#endif }; QHash<QQuickWindow *, WindowData> m_windows; diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h index 7568047fd2..32bfcb7148 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h +++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h @@ -101,13 +101,8 @@ private: QQuickWindow *window; QSGRenderThread *thread; QSurfaceFormat actualWindowFormat; -#ifndef QT_NO_BITFIELDS uint updateDuringSync : 1; uint forceRenderPass : 1; -#else - uint updateDuringSync = 1; - uint forceRenderPass = 1; -#endif }; friend class QSGRenderThread; diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode_p.h b/src/quick/scenegraph/util/qsgdefaultpainternode_p.h index af265c0ec2..084fc1e004 100644 --- a/src/quick/scenegraph/util/qsgdefaultpainternode_p.h +++ b/src/quick/scenegraph/util/qsgdefaultpainternode_p.h @@ -155,7 +155,6 @@ private: #endif qreal m_contentsScale; -#ifndef QT_NO_BITFIELDS bool m_dirtyContents : 1; bool m_opaquePainting : 1; bool m_linear_filtering : 1; @@ -167,20 +166,6 @@ private: bool m_dirtyGeometry : 1; bool m_dirtyRenderTarget : 1; bool m_dirtyTexture : 1; -#else - bool m_dirtyContents = 1; - bool m_opaquePainting = 1; - bool m_linear_filtering = 1; - bool m_mipmapping = 1; - bool m_smoothPainting = 1; - bool m_extensionsChecked = 1; - bool m_multisamplingSupported = 1; - bool m_fastFBOResizing = 1; - bool m_dirtyGeometry = 1; - bool m_dirtyRenderTarget = 1; - bool m_dirtyTexture = 1; -#endif - }; QT_END_NAMESPACE |