diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-12-21 16:04:30 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2022-01-07 01:03:47 +0100 |
| commit | 7cbac745dcbc42a8bbb19246d4ad98939c3217f8 (patch) | |
| tree | d7ac998a896eb6e7a1744b07225fa8cc03e94970 /src/gui/rhi/qrhimetal.mm | |
| parent | 521fea91690174ddd6340fc6f82554613854b017 (diff) | |
rhi: Returns mapping tables by value from QShader
As these are QList and QHash. All existing usages are based on this
anyway, no value in being able to indicate "not available" - an empty
container fulfills the same role.
Change-Id: I8059025fa7a4acb6fc674cd98b16fcafa19ed85d
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/gui/rhi/qrhimetal.mm')
| -rw-r--r-- | src/gui/rhi/qrhimetal.mm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm index 3a1eaccc92..ff136debe9 100644 --- a/src/gui/rhi/qrhimetal.mm +++ b/src/gui/rhi/qrhimetal.mm @@ -3642,8 +3642,7 @@ bool QMetalGraphicsPipeline::create() case QRhiShaderStage::Vertex: d->vs.lib = lib; d->vs.func = func; - if (const QShader::NativeResourceBindingMap *map = shader.nativeResourceBindingMap(activeKey)) - d->vs.nativeResourceBindingMap = *map; + d->vs.nativeResourceBindingMap = shader.nativeResourceBindingMap(activeKey); rhiD->d->shaderCache.insert(shaderStage, d->vs); [d->vs.lib retain]; [d->vs.func retain]; @@ -3652,8 +3651,7 @@ bool QMetalGraphicsPipeline::create() case QRhiShaderStage::Fragment: d->fs.lib = lib; d->fs.func = func; - if (const QShader::NativeResourceBindingMap *map = shader.nativeResourceBindingMap(activeKey)) - d->fs.nativeResourceBindingMap = *map; + d->fs.nativeResourceBindingMap = shader.nativeResourceBindingMap(activeKey); rhiD->d->shaderCache.insert(shaderStage, d->fs); [d->fs.lib retain]; [d->fs.func retain]; @@ -3810,8 +3808,7 @@ bool QMetalComputePipeline::create() d->cs.lib = lib; d->cs.func = func; d->cs.localSize = shader.description().computeShaderLocalSize(); - if (const QShader::NativeResourceBindingMap *map = shader.nativeResourceBindingMap(activeKey)) - d->cs.nativeResourceBindingMap = *map; + d->cs.nativeResourceBindingMap = shader.nativeResourceBindingMap(activeKey); if (rhiD->d->shaderCache.count() >= QRhiMetal::MAX_SHADER_CACHE_ENTRIES) { for (QMetalShader &s : rhiD->d->shaderCache) |