summaryrefslogtreecommitdiffstats
path: root/src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h
diff options
context:
space:
mode:
authorSvenn-Arne Dragly <s@dragly.com>2019-02-27 13:56:41 +0100
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-03-21 12:58:11 +0000
commitf79131795da23912908ae0fee8a9accd276fb181 (patch)
treedb257a0c5e7dfbc18f61c3671f215f97d64b27c9 /src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h
parentb35009fa7ac4c98f79cffaf5e538b4e525212343 (diff)
Dragon: Use LoadedBuffer and not Buffer when accessing data
Using LoadedBuffer is necessary to access data created from a generator. Change-Id: Iae984224007db5660bfc6453cf9e83661d106555 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h')
-rw-r--r--src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h b/src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h
index 7105dd5..55a0907 100644
--- a/src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h
+++ b/src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h
@@ -55,7 +55,7 @@ class Attribute;
class Entity;
class GeometryRenderer;
class Geometry;
-class Buffer;
+struct LoadedBuffer;
struct LocalBoundingVolumeResult {
Sphere boundingVolume;
@@ -69,9 +69,9 @@ struct LocalBoundingVolumeResult {
Qt3DCore::QNodeId indexAttributeId;
Immutable<Attribute> indexAttribute;
Qt3DCore::QNodeId positionBufferId;
- Immutable<Buffer> positionBuffer;
+ Immutable<LoadedBuffer> positionBuffer;
Qt3DCore::QNodeId indexBufferId;
- Immutable<Buffer> indexBuffer;
+ Immutable<LoadedBuffer> indexBuffer;
};
using LocalBoundingVolumes = ValueContainer<LocalBoundingVolumeResult>;
@@ -82,7 +82,7 @@ LocalBoundingVolumes calculateLocalBoundingVolumes(LocalBoundingVolumes localBou
const ValueContainer<Attribute> &attributes,
const ValueContainer<GeometryRenderer> &geometryRenderers,
const ValueContainer<Geometry> &geometries,
- const ValueContainer<Buffer> &buffers);
+ const ValueContainer<Qt3DRender::Dragon::LoadedBuffer> &buffers);
WorldBoundingVolumes calculateWorldBoundingVolumes(WorldBoundingVolumes worldBoundingVolumes,
const LocalBoundingVolumes &localBoundingVolumes,