diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-12 17:39:41 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-15 15:34:05 +0200 |
commit | 9b8d4a9e453b23f7b5b70280ee822f7f3a475261 (patch) | |
tree | b3266327294cbb0b82f58417e44e85379acf6465 /tests/manual/rhi/msaatexture | |
parent | ed231455cc22f6280be917780013584020d208d8 (diff) |
rhi manual tests: Prevent warnings with MSVC
The QPair changes trigger warnings about size_t vs. quint32.
We made offsets and sizes 32-bit in the QRhi API to emphasize that
some of the graphics APIs are using 32-bit sizes still. It's a bit
unfortunate that pairs now generate warnings when the size does not
match. Just cast as needed.
Change-Id: I88504eed8be6f4bdb2205b3671e2c2a9db9fcb1e
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests/manual/rhi/msaatexture')
-rw-r--r-- | tests/manual/rhi/msaatexture/msaatexture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/rhi/msaatexture/msaatexture.cpp b/tests/manual/rhi/msaatexture/msaatexture.cpp index b7c306f97e..1b735d2984 100644 --- a/tests/manual/rhi/msaatexture/msaatexture.cpp +++ b/tests/manual/rhi/msaatexture/msaatexture.cpp @@ -171,7 +171,7 @@ void Window::customInit() inputLayout.setBindings({ { 4 * sizeof(float) } }); inputLayout.setAttributes({ { 0, 0, QRhiVertexInputAttribute::Float2, 0 }, - { 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) } + { 0, 1, QRhiVertexInputAttribute::Float2, quint32(2 * sizeof(float)) } }); d.psLeft->setVertexInputLayout(inputLayout); d.psLeft->setShaderResourceBindings(d.srbLeft); @@ -227,7 +227,7 @@ void Window::customInit() }); inputLayout.setAttributes({ { 0, 0, QRhiVertexInputAttribute::Float2, 0 }, - { 0, 1, QRhiVertexInputAttribute::Float3, 2 * sizeof(float) } + { 0, 1, QRhiVertexInputAttribute::Float3, quint32(2 * sizeof(float)) } }); d.triPs->setVertexInputLayout(inputLayout); d.triPs->setShaderResourceBindings(d.triSrb); @@ -299,7 +299,7 @@ void Window::customRender() cb->setGraphicsPipeline(d.triPs); cb->setViewport({ 0, 0, float(d.msaaTex->pixelSize().width()), float(d.msaaTex->pixelSize().height()) }); cb->setShaderResources(); - QRhiCommandBuffer::VertexInput vbufBinding(d.vbuf, sizeof(vertexData)); + QRhiCommandBuffer::VertexInput vbufBinding(d.vbuf, quint32(sizeof(vertexData))); cb->setVertexInput(0, 1, &vbufBinding); cb->draw(3); cb->endPass(); |