diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-02 18:00:52 +0200 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@qt.io> | 2018-05-04 12:00:29 +0000 |
| commit | 43cebede39c9340c29bad6c6a78b76446d54c0db (patch) | |
| tree | c6b9107da502d3c73d0aa1137532bd040e4bca71 /src/render/renderers/opengl/renderer/renderer_p.h | |
| parent | 7f0bdc21a8f1a5fbe2afdba61f037a71f00c1d61 (diff) | |
Avoid locking up on Radeonv5.11.0-rc1
Could not find a decent way to do a renderer/vendor string query due to
the convoluted internals so just used a define for now.
Task-number: QTBUG-67937
Change-Id: I0dcfa41377a5e430d3f7973c5aaa01535100c53c
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/render/renderers/opengl/renderer/renderer_p.h')
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderer_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h index 1d459a15e..bf9554a54 100644 --- a/src/render/renderers/opengl/renderer/renderer_p.h +++ b/src/render/renderers/opengl/renderer/renderer_p.h @@ -226,7 +226,7 @@ public: // Executed in secondary GL thread - void loadShader(Shader *shader) const override; + void loadShader(Shader *shader, Qt3DRender::Render::HShader shaderHandle) override; void updateGLResources(); @@ -382,6 +382,7 @@ private: QVector<HBuffer> m_dirtyBuffers; QVector<HBuffer> m_downloadableBuffers; + QVector<HShader> m_dirtyShaders; QVector<HTexture> m_dirtyTextures; bool m_ownedContext; |