1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: remove unnecessary float casts

Browse Source 
Since 5bb4baae0379d5903f547f0399be9620f5ab06a0 QColor functions already
return floats.

Change-Id: I8e5261397c5807123fb4b3288f229c23c2324995
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Aurélien Brooke 2025-01-21 10:34:32 +01:00
parent cd1686e55f
commit 6f9e40ad39
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/rhi/qrhid3d11.cpp
View File

@ -2189,10 +2189,10 @@ void QRhiD3D11::beginPass(QRhiCommandBuffer *cb,
if (rtD->dsAttCount && wantsDsClear) if (rtD->dsAttCount && wantsDsClear)
clearCmd.args.clear.mask |= QD3D11CommandBuffer::Command::Depth | QD3D11CommandBuffer::Command::Stencil; clearCmd.args.clear.mask |= QD3D11CommandBuffer::Command::Depth | QD3D11CommandBuffer::Command::Stencil;
clearCmd.args.clear.c[0] = float(colorClearValue.redF()); clearCmd.args.clear.c[0] = colorClearValue.redF();
clearCmd.args.clear.c[1] = float(colorClearValue.greenF()); clearCmd.args.clear.c[1] = colorClearValue.greenF();
clearCmd.args.clear.c[2] = float(colorClearValue.blueF()); clearCmd.args.clear.c[2] = colorClearValue.blueF();
clearCmd.args.clear.c[3] = float(colorClearValue.alphaF()); clearCmd.args.clear.c[3] = colorClearValue.alphaF();
clearCmd.args.clear.d = depthStencilClearValue.depthClearValue(); clearCmd.args.clear.d = depthStencilClearValue.depthClearValue();
clearCmd.args.clear.s = depthStencilClearValue.stencilClearValue(); clearCmd.args.clear.s = depthStencilClearValue.stencilClearValue();

16
src/gui/rhi/qrhigles2.cpp
View File

@ -2061,10 +2061,10 @@ void QRhiGles2::setBlendConstants(QRhiCommandBuffer *cb, const QColor &c)
QGles2CommandBuffer::Command &cmd(cbD->commands.get()); QGles2CommandBuffer::Command &cmd(cbD->commands.get());
cmd.cmd = QGles2CommandBuffer::Command::BlendConstants; cmd.cmd = QGles2CommandBuffer::Command::BlendConstants;
cmd.args.blendConstants.r = float(c.redF()); cmd.args.blendConstants.r = c.redF();
cmd.args.blendConstants.g = float(c.greenF()); cmd.args.blendConstants.g = c.greenF();
cmd.args.blendConstants.b = float(c.blueF()); cmd.args.blendConstants.b = c.blueF();
cmd.args.blendConstants.a = float(c.alphaF()); cmd.args.blendConstants.a = c.alphaF();
} }
void QRhiGles2::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue) void QRhiGles2::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue)
@ -4646,10 +4646,10 @@ void QRhiGles2::beginPass(QRhiCommandBuffer *cb,
clearCmd.args.clear.mask |= GL_COLOR_BUFFER_BIT; clearCmd.args.clear.mask |= GL_COLOR_BUFFER_BIT;
if (rtD->dsAttCount && wantsDsClear) if (rtD->dsAttCount && wantsDsClear)
clearCmd.args.clear.mask |= GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT; clearCmd.args.clear.mask |= GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
clearCmd.args.clear.c[0] = float(colorClearValue.redF()); clearCmd.args.clear.c[0] = colorClearValue.redF();
clearCmd.args.clear.c[1] = float(colorClearValue.greenF()); clearCmd.args.clear.c[1] = colorClearValue.greenF();
clearCmd.args.clear.c[2] = float(colorClearValue.blueF()); clearCmd.args.clear.c[2] = colorClearValue.blueF();
clearCmd.args.clear.c[3] = float(colorClearValue.alphaF()); clearCmd.args.clear.c[3] = colorClearValue.alphaF();
clearCmd.args.clear.d = depthStencilClearValue.depthClearValue(); clearCmd.args.clear.d = depthStencilClearValue.depthClearValue();
clearCmd.args.clear.s = depthStencilClearValue.stencilClearValue(); clearCmd.args.clear.s = depthStencilClearValue.stencilClearValue();

4
src/gui/rhi/qrhimetal.mm
View File

@ -1931,8 +1931,8 @@ void QRhiMetal::setBlendConstants(QRhiCommandBuffer *cb, const QColor &c)
QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb); QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass); Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
[cbD->d->currentRenderPassEncoder setBlendColorRed: float(c.redF()) [cbD->d->currentRenderPassEncoder setBlendColorRed: c.redF()
green: float(c.greenF()) blue: float(c.blueF()) alpha: float(c.alphaF())]; green: c.greenF() blue: c.blueF() alpha: c.alphaF()];
} }
void QRhiMetal::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue) void QRhiMetal::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue)

8
src/gui/rhi/qrhivulkan.cpp
View File

@ -6009,10 +6009,10 @@ void QRhiVulkan::setBlendConstants(QRhiCommandBuffer *cb, const QColor &c)
} else { } else {
QVkCommandBuffer::Command &cmd(cbD->commands.get()); QVkCommandBuffer::Command &cmd(cbD->commands.get());
cmd.cmd = QVkCommandBuffer::Command::SetBlendConstants; cmd.cmd = QVkCommandBuffer::Command::SetBlendConstants;
cmd.args.setBlendConstants.c[0] = float(c.redF()); cmd.args.setBlendConstants.c[0] = c.redF();
cmd.args.setBlendConstants.c[1] = float(c.greenF()); cmd.args.setBlendConstants.c[1] = c.greenF();
cmd.args.setBlendConstants.c[2] = float(c.blueF()); cmd.args.setBlendConstants.c[2] = c.blueF();
cmd.args.setBlendConstants.c[3] = float(c.alphaF()); cmd.args.setBlendConstants.c[3] = c.alphaF();
} }
} }