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

rhi: Remove readback result type alias

Browse Source 
Change-Id: I1b14d3230ab4011506892c64ea03d5431d82a90d
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Laszlo Agocs 2023-04-03 19:27:13 +02:00
parent 33b7a3b846
commit 82112db29d
10 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/rhi/qrhi.cpp
View File

@ -6056,7 +6056,7 @@ void QRhiResourceUpdateBatch::uploadStaticBuffer(QRhiBuffer *buf, const void *da
A readback is asynchronous. \a result contains a callback that is invoked A readback is asynchronous. \a result contains a callback that is invoked
when the operation has completed. The data is provided in when the operation has completed. The data is provided in
QRhiBufferReadbackResult::data. Upon successful completion that QByteArray QRhiReadbackResult::data. Upon successful completion that QByteArray
will have a size equal to \a size. On failure the QByteArray will be empty. will have a size equal to \a size. On failure the QByteArray will be empty.
\note Reading buffers with a usage different than QRhiBuffer::UniformBuffer \note Reading buffers with a usage different than QRhiBuffer::UniformBuffer
@ -6073,7 +6073,7 @@ void QRhiResourceUpdateBatch::uploadStaticBuffer(QRhiBuffer *buf, const void *da
\sa readBackTexture(), QRhi::isFeatureSupported(), QRhi::resourceLimit() \sa readBackTexture(), QRhi::isFeatureSupported(), QRhi::resourceLimit()
*/ */
void QRhiResourceUpdateBatch::readBackBuffer(QRhiBuffer *buf, quint32 offset, quint32 size, QRhiBufferReadbackResult *result) void QRhiResourceUpdateBatch::readBackBuffer(QRhiBuffer *buf, quint32 offset, quint32 size, QRhiReadbackResult *result)
{ {
const int idx = d->activeBufferOpCount++; const int idx = d->activeBufferOpCount++;
if (idx < d->bufferOps.size()) if (idx < d->bufferOps.size())

4
src/gui/rhi/qrhi_p.h
View File

@ -1680,8 +1680,6 @@ struct Q_GUI_EXPORT QRhiReadbackResult
QByteArray data; QByteArray data;
}; };
using QRhiBufferReadbackResult = QRhiReadbackResult;
class Q_GUI_EXPORT QRhiResourceUpdateBatch class Q_GUI_EXPORT QRhiResourceUpdateBatch
{ {
public: public:
@ -1695,7 +1693,7 @@ public:
void updateDynamicBuffer(QRhiBuffer *buf, quint32 offset, quint32 size, const void *data); void updateDynamicBuffer(QRhiBuffer *buf, quint32 offset, quint32 size, const void *data);
void uploadStaticBuffer(QRhiBuffer *buf, quint32 offset, quint32 size, const void *data); void uploadStaticBuffer(QRhiBuffer *buf, quint32 offset, quint32 size, const void *data);
void uploadStaticBuffer(QRhiBuffer *buf, const void *data); void uploadStaticBuffer(QRhiBuffer *buf, const void *data);
void readBackBuffer(QRhiBuffer *buf, quint32 offset, quint32 size, QRhiBufferReadbackResult *result); void readBackBuffer(QRhiBuffer *buf, quint32 offset, quint32 size, QRhiReadbackResult *result);
void uploadTexture(QRhiTexture *tex, const QRhiTextureUploadDescription &desc); void uploadTexture(QRhiTexture *tex, const QRhiTextureUploadDescription &desc);
void uploadTexture(QRhiTexture *tex, const QImage &image); void uploadTexture(QRhiTexture *tex, const QImage &image);
void copyTexture(QRhiTexture *dst, QRhiTexture *src, const QRhiTextureCopyDescription &desc = QRhiTextureCopyDescription()); void copyTexture(QRhiTexture *dst, QRhiTexture *src, const QRhiTextureCopyDescription &desc = QRhiTextureCopyDescription());

4
src/gui/rhi/qrhi_p_p.h
View File

@ -399,7 +399,7 @@ public:
quint32 offset; quint32 offset;
QRhiBufferData data; QRhiBufferData data;
quint32 readSize; quint32 readSize;
QRhiBufferReadbackResult *result; QRhiReadbackResult *result;
static BufferOp dynamicUpdate(QRhiBuffer *buf, quint32 offset, quint32 size, const void *data) static BufferOp dynamicUpdate(QRhiBuffer *buf, quint32 offset, quint32 size, const void *data)
{ {
@ -441,7 +441,7 @@ public:
op->data.assign(reinterpret_cast<const char *>(data), effectiveSize); op->data.assign(reinterpret_cast<const char *>(data), effectiveSize);
} }
static BufferOp read(QRhiBuffer *buf, quint32 offset, quint32 size, QRhiBufferReadbackResult *result) static BufferOp read(QRhiBuffer *buf, quint32 offset, quint32 size, QRhiReadbackResult *result)
{ {
BufferOp op = {}; BufferOp op = {};
op.type = Read; op.type = Read;

2
src/gui/rhi/qrhid3d11_p_p.h
View File

@ -774,7 +774,7 @@ public:
}; };
QVarLengthArray<TextureReadback, 2> activeTextureReadbacks; QVarLengthArray<TextureReadback, 2> activeTextureReadbacks;
struct BufferReadback { struct BufferReadback {
QRhiBufferReadbackResult *result; QRhiReadbackResult *result;
quint32 byteSize; quint32 byteSize;
ID3D11Buffer *stagingBuf; ID3D11Buffer *stagingBuf;
}; };

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

@ -3141,7 +3141,7 @@ void QRhiGles2::executeCommandBuffer(QRhiCommandBuffer *cb)
break; break;
case QGles2CommandBuffer::Command::GetBufferSubData: case QGles2CommandBuffer::Command::GetBufferSubData:
{ {
QRhiBufferReadbackResult *result = cmd.args.getBufferSubData.result; QRhiReadbackResult *result = cmd.args.getBufferSubData.result;
bindVertexIndexBufferWithStateReset(&state, f, cmd.args.getBufferSubData.target, cmd.args.getBufferSubData.buffer); bindVertexIndexBufferWithStateReset(&state, f, cmd.args.getBufferSubData.target, cmd.args.getBufferSubData.buffer);
if (caps.gles) { if (caps.gles) {
if (caps.properMapBuffer) { if (caps.properMapBuffer) {

2
src/gui/rhi/qrhigles2_p_p.h
View File

@ -414,7 +414,7 @@ struct QGles2CommandBuffer : public QRhiCommandBuffer
const void *data; // must come from retainData() const void *data; // must come from retainData()
} bufferSubData; } bufferSubData;
struct { struct {
QRhiBufferReadbackResult *result; QRhiReadbackResult *result;
GLenum target; GLenum target;
GLuint buffer; GLuint buffer;
int offset; int offset;

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

@ -211,7 +211,7 @@ struct QRhiMetalData
struct BufferReadback struct BufferReadback
{ {
int activeFrameSlot = -1; int activeFrameSlot = -1;
QRhiBufferReadbackResult *result; QRhiReadbackResult *result;
quint32 offset; quint32 offset;
quint32 readSize; quint32 readSize;
id<MTLBuffer> buf; id<MTLBuffer> buf;

2
src/gui/rhi/qrhinull.cpp
View File

@ -456,7 +456,7 @@ void QRhiNull::resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *re
QNullBuffer *bufD = QRHI_RES(QNullBuffer, u.buf); QNullBuffer *bufD = QRHI_RES(QNullBuffer, u.buf);
memcpy(bufD->data + u.offset, u.data.constData(), size_t(u.data.size())); memcpy(bufD->data + u.offset, u.data.constData(), size_t(u.data.size()));
} else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::Read) { } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::Read) {
QRhiBufferReadbackResult *result = u.result; QRhiReadbackResult *result = u.result;
result->data.resize(u.readSize); result->data.resize(u.readSize);
QNullBuffer *bufD = QRHI_RES(QNullBuffer, u.buf); QNullBuffer *bufD = QRHI_RES(QNullBuffer, u.buf);
memcpy(result->data.data(), bufD->data + u.offset, size_t(u.readSize)); memcpy(result->data.data(), bufD->data + u.offset, size_t(u.readSize));

2
src/gui/rhi/qrhivulkan_p_p.h
View File

@ -918,7 +918,7 @@ public:
QVarLengthArray<TextureReadback, 2> activeTextureReadbacks; QVarLengthArray<TextureReadback, 2> activeTextureReadbacks;
struct BufferReadback { struct BufferReadback {
int activeFrameSlot = -1; int activeFrameSlot = -1;
QRhiBufferReadbackResult *result; QRhiReadbackResult *result;
quint32 byteSize; quint32 byteSize;
VkBuffer stagingBuf; VkBuffer stagingBuf;
QVkAlloc stagingAlloc; QVkAlloc stagingAlloc;

12
tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
View File

@ -983,7 +983,7 @@ void tst_QRhi::resourceUpdateBatchBuffer()
batch->updateDynamicBuffer(dynamicBuffer.data(), 10, bufferSize - 10, a.constData()); batch->updateDynamicBuffer(dynamicBuffer.data(), 10, bufferSize - 10, a.constData());
batch->updateDynamicBuffer(dynamicBuffer.data(), 0, 12, b.constData()); batch->updateDynamicBuffer(dynamicBuffer.data(), 0, 12, b.constData());
QRhiBufferReadbackResult readResult; QRhiReadbackResult readResult;
bool readCompleted = false; bool readCompleted = false;
readResult.completed = [&readCompleted] { readCompleted = true; }; readResult.completed = [&readCompleted] { readCompleted = true; };
batch->readBackBuffer(dynamicBuffer.data(), 5, 10, &readResult); batch->readBackBuffer(dynamicBuffer.data(), 5, 10, &readResult);
@ -1010,7 +1010,7 @@ void tst_QRhi::resourceUpdateBatchBuffer()
batch->uploadStaticBuffer(dynamicBuffer.data(), 10, bufferSize - 10, a.constData()); batch->uploadStaticBuffer(dynamicBuffer.data(), 10, bufferSize - 10, a.constData());
batch->uploadStaticBuffer(dynamicBuffer.data(), 0, 12, b.constData()); batch->uploadStaticBuffer(dynamicBuffer.data(), 0, 12, b.constData());
QRhiBufferReadbackResult readResult; QRhiReadbackResult readResult;
bool readCompleted = false; bool readCompleted = false;
readResult.completed = [&readCompleted] { readCompleted = true; }; readResult.completed = [&readCompleted] { readCompleted = true; };
@ -3872,7 +3872,7 @@ void tst_QRhi::resourceUpdateBatchBufferTextureWithSwapchainFrames()
const char *b = "abcdefghi"; const char *b = "abcdefghi";
bool readCompleted = false; bool readCompleted = false;
QRhiBufferReadbackResult readResult; QRhiReadbackResult readResult;
readResult.completed = [&readCompleted] { readCompleted = true; }; readResult.completed = [&readCompleted] { readCompleted = true; };
QRhiReadbackResult texReadResult; QRhiReadbackResult texReadResult;
texReadResult.completed = [&readCompleted] { readCompleted = true; }; texReadResult.completed = [&readCompleted] { readCompleted = true; };
@ -5937,7 +5937,7 @@ void tst_QRhi::tessellationInterfaceBlocks()
QRhiResourceUpdateBatch *readbackBatch = rhi->nextResourceUpdateBatch(); QRhiResourceUpdateBatch *readbackBatch = rhi->nextResourceUpdateBatch();
readbackBatch->readBackTexture({ texture.data() }, &readResult); readbackBatch->readBackTexture({ texture.data() }, &readResult);
QRhiBufferReadbackResult bufferReadResult; QRhiReadbackResult bufferReadResult;
bufferReadResult.completed = []() {}; bufferReadResult.completed = []() {};
readbackBatch->readBackBuffer(buffer.data(), 0, 1024, &bufferReadResult); readbackBatch->readBackBuffer(buffer.data(), 0, 1024, &bufferReadResult);
@ -6213,7 +6213,7 @@ void tst_QRhi::storageBuffer()
QVERIFY(u); QVERIFY(u);
int readCompletedNotifications = 0; int readCompletedNotifications = 0;
QRhiBufferReadbackResult result; QRhiReadbackResult result;
result.completed = [&readCompletedNotifications]() { readCompletedNotifications++; }; result.completed = [&readCompletedNotifications]() { readCompletedNotifications++; };
u->readBackBuffer(fromGpuBuffer.data(), 0, blocks["fromGpu"].knownSize, &result); u->readBackBuffer(fromGpuBuffer.data(), 0, blocks["fromGpu"].knownSize, &result);
@ -6338,7 +6338,7 @@ void tst_QRhi::storageBuffer()
u = rhi->nextResourceUpdateBatch(); u = rhi->nextResourceUpdateBatch();
QVERIFY(u); QVERIFY(u);
int readbackCompleted = 0; int readbackCompleted = 0;
QRhiBufferReadbackResult result; QRhiReadbackResult result;
result.completed = [&readbackCompleted]() { readbackCompleted++; }; result.completed = [&readbackCompleted]() { readbackCompleted++; };
u->readBackBuffer(fromGpuBuffer.data(), 0, fromGpuBuffer->size(), &result); u->readBackBuffer(fromGpuBuffer.data(), 0, fromGpuBuffer->size(), &result);