diff options
Diffstat (limited to 'src/runtime/dragon/jobs')
-rw-r--r-- | src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp | 6 | ||||
-rw-r--r-- | src/runtime/dragon/jobs/dragonboundingvolumejobs_p.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp b/src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp index e996c7d..2b96f3b 100644 --- a/src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp +++ b/src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp @@ -57,9 +57,9 @@ public: const Sphere &result() { return m_volume; } bool apply(const Attribute &positionAttribute, - const Buffer &attributeBuffer, + const LoadedBuffer &attributeBuffer, const Attribute &indexAttribute, - const Buffer &indexBuffer, + const LoadedBuffer &indexBuffer, int drawVertexCount, bool primitiveRestartEnabled, int primitiveRestartIndex) @@ -181,7 +181,7 @@ LocalBoundingVolumes calculateLocalBoundingVolumes(LocalBoundingVolumes localBou const ValueContainer<Attribute> &attributes, const ValueContainer<GeometryRenderer> &geometryRenderers, const ValueContainer<Geometry> &geometries, - const ValueContainer<Buffer> &buffers) + const ValueContainer<LoadedBuffer> &buffers) { localBoundingVolumes.reset(); 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, |