diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:56 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-03-11 15:39:56 +0100 |
| commit | 3d315860cdf13fe2adf78c8eea07aea10444ed72 (patch) | |
| tree | b5a7daa8534b8dadc3abfd665655af3a2450af76 /src/gui/rhi/qrhid3d11_p_p.h | |
| parent | cd80f347cf5d40938df7c10d1f6dac3d8c81ff95 (diff) | |
| parent | 865afac25036d58b18794384e37d42931b2164c5 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/gui/rhi/qrhid3d11_p_p.h')
| -rw-r--r-- | src/gui/rhi/qrhid3d11_p_p.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/rhi/qrhid3d11_p_p.h b/src/gui/rhi/qrhid3d11_p_p.h index f749b612b5..33412b8011 100644 --- a/src/gui/rhi/qrhid3d11_p_p.h +++ b/src/gui/rhi/qrhid3d11_p_p.h @@ -210,10 +210,13 @@ struct QD3D11ShaderResourceBindings : public QRhiShaderResourceBindings uint generation; }; struct BoundSampledTextureData { - quint64 texId; - uint texGeneration; - quint64 samplerId; - uint samplerGeneration; + int count; + struct { + quint64 texId; + uint texGeneration; + quint64 samplerId; + uint samplerGeneration; + } d[QRhiShaderResourceBinding::Data::MAX_TEX_SAMPLER_ARRAY_SIZE]; }; struct BoundStorageImageData { quint64 id; |