diff options
| author | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2020-03-17 16:07:38 +0100 |
|---|---|---|
| committer | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2020-04-22 09:36:46 +0200 |
| commit | df4ec04dae8c0ce9fa3b27bc8e48eb2d36a20962 (patch) | |
| tree | 723fe393774b3f697bd9bc5d87a41220b377953c /src/plugins/renderers/rhi/renderer/rendercommand_p.h | |
| parent | a01dbe5b0e1b912c7210abc304700020e685aff0 (diff) | |
rhi: Port most of Qt3DExtras materials to RHI
Change-Id: Iba20f047404b20c1e5b9bdcef917b3c2a1000d59
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/renderers/rhi/renderer/rendercommand_p.h')
| -rw-r--r-- | src/plugins/renderers/rhi/renderer/rendercommand_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/renderers/rhi/renderer/rendercommand_p.h b/src/plugins/renderers/rhi/renderer/rendercommand_p.h index e848ae593..f4031b711 100644 --- a/src/plugins/renderers/rhi/renderer/rendercommand_p.h +++ b/src/plugins/renderers/rhi/renderer/rendercommand_p.h @@ -68,8 +68,6 @@ QT_BEGIN_NAMESPACE class QRhiGraphicsPipeline; class QRhiShaderResourceBindings; -class QOpenGLVertexArrayObject; - namespace Qt3DRender { namespace Render { @@ -87,11 +85,12 @@ struct CommandUBO float modelMatrix[16]; float inverseModelMatrix[16]; float modelViewMatrix[16]; + float modelNormalMatrix[12]; float inverseModelViewMatrix[16]; float mvp[16]; float inverseModelViewProjectionMatrix[16]; }; -static_assert(sizeof(CommandUBO) == 6 * (16 * sizeof(float)), "UBO doesn't match std140"); +static_assert(sizeof(CommandUBO) == 6 * (16 * sizeof(float)) + 1 * (12 * sizeof(float)), "UBO doesn't match std140"); class Q_AUTOTEST_EXPORT RenderCommand { |