whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Laszlo Agocs 2020-06-12 17:39:41 +02:00
parent ed231455cc
commit 9b8d4a9e45
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/manual/rhi/compressedtexture_bc1/compressedtexture_bc1.cpp
View File

@ -191,7 +191,7 @@ void Window::customRender()
cb->setShaderResources();
const QRhiCommandBuffer::VertexInput vbufBindings[] = {
{ d.vbuf, 0 },
{ d.vbuf, 36 * 3 * sizeof(float) }
{ d.vbuf, quint32(36 * 3 * sizeof(float)) }
};
cb->setVertexInput(0, 2, vbufBindings);
cb->draw(36);

2
tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.cpp
View File

@ -204,7 +204,7 @@ void Window::customRender()
cb->setShaderResources();
const QRhiCommandBuffer::VertexInput vbufBindings[] = {
{ d.vbuf, 0 },
{ d.vbuf, 36 * 3 * sizeof(float) }
{ d.vbuf, quint32(36 * 3 * sizeof(float)) }
};
cb->setVertexInput(0, 2, vbufBindings);
cb->draw(36);

6
tests/manual/rhi/mrt/mrt.cpp
View File

@ -166,7 +166,7 @@ void Window::customInit()
});
inputLayout.setAttributes({
{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) }
{ 0, 1, QRhiVertexInputAttribute::Float2, quint32(2 * sizeof(float)) }
});
d.ps->setVertexInputLayout(inputLayout);
d.ps->setShaderResourceBindings(d.colData[0].srb); // all of them are layout-compatible
@ -209,7 +209,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);
@ -248,7 +248,7 @@ void Window::customRender()
cb->setGraphicsPipeline(d.triPs);
cb->setViewport({ 0, 0, float(d.rt->pixelSize().width()), float(d.rt->pixelSize().height()) });
cb->setShaderResources();
QRhiCommandBuffer::VertexInput vbufBinding(d.vbuf, sizeof(quadVertexData));
QRhiCommandBuffer::VertexInput vbufBinding(d.vbuf, quint32(sizeof(quadVertexData)));
cb->setVertexInput(0, 1, &vbufBinding);
cb->draw(3);
cb->endPass();

6
tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp
View File

@ -155,7 +155,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);
@ -186,7 +186,7 @@ void Window::customInit()
});
inputLayout.setAttributes({
{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) }
{ 0, 1, QRhiVertexInputAttribute::Float2, quint32(2 * sizeof(float)) }
});
d.ps->setVertexInputLayout(inputLayout);
d.ps->setShaderResourceBindings(d.srb);
@ -241,7 +241,7 @@ void Window::customRender()
cb->setGraphicsPipeline(d.triPs);
cb->setViewport({ 0, 0, float(d.rb->pixelSize().width()), float(d.rb->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();

6
tests/manual/rhi/msaatexture/msaatexture.cpp
View File

@ -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();

2
tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
View File

@ -613,7 +613,7 @@ void Renderer::render(bool newlyExposed, bool wakeBeforePresent)
cb->setShaderResources();
const QRhiCommandBuffer::VertexInput vbufBindings[] = {
{ m_vbuf, 0 },
{ m_vbuf, 36 * 3 * sizeof(float) }
{ m_vbuf, quint32(36 * 3 * sizeof(float)) }
};
cb->setVertexInput(0, 2, vbufBindings);
cb->draw(36);

2
tests/manual/rhi/texuploads/texuploads.cpp
View File

@ -302,7 +302,7 @@ void Window::customRender()
cb->setShaderResources();
const QRhiCommandBuffer::VertexInput vbufBindings[] = {
{ d.vbuf, 0 },
{ d.vbuf, 36 * 3 * sizeof(float) }
{ d.vbuf, quint32(36 * 3 * sizeof(float)) }
};
cb->setVertexInput(0, 2, vbufBindings);
cb->draw(36);

2
tests/manual/rhi/triquadcube/texturedcuberenderer.cpp
View File

@ -217,7 +217,7 @@ void TexturedCubeRenderer::queueDraw(QRhiCommandBuffer *cb, const QSize &outputS
cb->setShaderResources();
const QRhiCommandBuffer::VertexInput vbufBindings[] = {
{ m_vbuf, 0 },
{ m_vbuf, 36 * 3 * sizeof(float) }
{ m_vbuf, quint32(36 * 3 * sizeof(float)) }
};
cb->setVertexInput(0, 2, vbufBindings);
cb->draw(36);

2
tests/manual/rhi/triquadcube/triangleoncuberenderer.cpp
View File

@ -285,7 +285,7 @@ void TriangleOnCubeRenderer::queueDraw(QRhiCommandBuffer *cb, const QSize &outpu
cb->setShaderResources();
const QRhiCommandBuffer::VertexInput vbufBindings[] = {
{ m_vbuf, 0 },
{ m_vbuf, 36 * 3 * sizeof(float) }
{ m_vbuf, quint32(36 * 3 * sizeof(float)) }
};
cb->setVertexInput(0, 2, vbufBindings);
cb->draw(36);