diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 13:59:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 13:59:21 +0200 |
| commit | 7750d9014ee38cffe349af5c50f715774e7b1982 (patch) | |
| tree | 3c7ce21d9c968f6f7a5a930324f2de4e7929e805 /src/plugins/common/evr/evrd3dpresentengine.h | |
| parent | 83c49ab485026f35fbd9b5f8242be967a0a24e8b (diff) | |
| parent | ab9f3f089c6f9537ae316697ee151ad63c6618fd (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta2
Change-Id: I70b363e614391ecce15ed55ef1267973c8b21355
Diffstat (limited to 'src/plugins/common/evr/evrd3dpresentengine.h')
| -rw-r--r-- | src/plugins/common/evr/evrd3dpresentengine.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/common/evr/evrd3dpresentengine.h b/src/plugins/common/evr/evrd3dpresentengine.h index df2c9b506..8e2a444f3 100644 --- a/src/plugins/common/evr/evrd3dpresentengine.h +++ b/src/plugins/common/evr/evrd3dpresentengine.h @@ -143,8 +143,7 @@ private: bool m_useTextureRendering; #ifdef MAYBE_ANGLE - bool createRenderTexture(); - bool updateTexture(IDirect3DSurface9 *src); + unsigned int updateTexture(IDirect3DSurface9 *src); OpenGLResources *m_glResources; IDirect3DTexture9 *m_texture; |