diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-16 01:00:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-16 01:00:49 +0200 |
| commit | faab18c65ab63617c2e03a27a7a03dfae050292f (patch) | |
| tree | 891a02e8876ee84d999d7d172f0f7c38d174366d /src/gui/rhi/qrhigles2_p_p.h | |
| parent | 06ca5c49e7fb6dd23eab3a02de404c82e03bc5db (diff) | |
| parent | 9cc040a806fd2e6f1458e801a99311168d594c77 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ifd83db69416230175ddc3161f640b612755018fc
Diffstat (limited to 'src/gui/rhi/qrhigles2_p_p.h')
| -rw-r--r-- | src/gui/rhi/qrhigles2_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/rhi/qrhigles2_p_p.h b/src/gui/rhi/qrhigles2_p_p.h index 8814d9c19d..cc945876e6 100644 --- a/src/gui/rhi/qrhigles2_p_p.h +++ b/src/gui/rhi/qrhigles2_p_p.h @@ -300,6 +300,7 @@ struct QGles2CommandBuffer : public QRhiCommandBuffer enum Cmd { BeginFrame, EndFrame, + ResetFrame, Viewport, Scissor, BlendConstants, |