From bcce9a20913d4b714405b3d3dfb126de411db4f8 Mon Sep 17 00:00:00 2001
From: Heather Anderson <heath@odysseus.anderson.name>
Date: Sat, 11 Sep 2021 15:15:04 -0700
Subject: [PATCH] convert explicit shared pointer creation (using "new") to
make_shared where possible/appropriate
---
assignment-client/src/AssignmentDynamicFactory.cpp | 2 +-
assignment-client/src/entities/EntityServer.cpp | 2 +-
.../src/entities/EntityTreeHeadlessViewer.h | 2 +-
domain-server/src/DomainServerSettingsManager.cpp | 4 ++--
interface/src/raypick/ParabolaPointer.cpp | 2 +-
interface/src/ui/overlays/Overlays.cpp | 6 +++---
libraries/animation/src/AnimationCache.cpp | 4 ++--
libraries/audio/src/SoundCache.cpp | 4 ++--
libraries/baking/src/MaterialBaker.cpp | 2 +-
.../src/controllers/impl/MappingBuilderProxy.cpp | 2 +-
.../src/controllers/impl/RouteBuilderProxy.cpp | 4 ++--
.../src/display-plugins/OpenGLDisplayPlugin.cpp | 4 ++--
.../src/display-plugins/hmd/HmdDisplayPlugin.cpp | 2 +-
.../stereo/InterleavedStereoDisplayPlugin.cpp | 2 +-
libraries/entities-renderer/src/EntityTreeRenderer.h | 2 +-
.../src/RenderableModelEntityItem.cpp | 4 ++--
.../src/RenderablePolyLineEntityItem.cpp | 2 +-
.../src/RenderablePolyVoxEntityItem.cpp | 2 +-
libraries/entities/src/LightEntityItem.cpp | 2 +-
libraries/entities/src/LineEntityItem.cpp | 2 +-
libraries/entities/src/ModelEntityItem.cpp | 2 +-
libraries/entities/src/ParticleEffectEntityItem.cpp | 2 +-
libraries/entities/src/PolyLineEntityItem.cpp | 2 +-
libraries/entities/src/PolyVoxEntityItem.cpp | 2 +-
libraries/entities/src/TextEntityItem.cpp | 2 +-
libraries/entities/src/WebEntityItem.cpp | 2 +-
libraries/entities/src/ZoneEntityItem.cpp | 2 +-
libraries/gpu/src/gpu/Context.cpp | 2 +-
.../graphics-scripting/GraphicsScriptingInterface.cpp | 2 +-
libraries/graphics/src/graphics/Geometry.cpp | 2 +-
.../src/material-networking/ShaderCache.cpp | 4 ++--
.../src/material-networking/TextureCache.cpp | 6 +++---
.../src/model-networking/ModelCache.cpp | 4 ++--
libraries/networking/src/NodePermissions.h | 2 +-
libraries/plugins/src/plugins/PluginManager.cpp | 2 +-
.../src/procedural/ProceduralMaterialCache.cpp | 4 ++--
libraries/recording/src/recording/ClipCache.cpp | 4 ++--
libraries/render-utils/src/AmbientOcclusionEffect.cpp | 10 +++++-----
libraries/render-utils/src/AntialiasingEffect.cpp | 10 +++++-----
libraries/render-utils/src/BloomEffect.cpp | 8 ++++----
libraries/render-utils/src/DrawHaze.cpp | 2 +-
libraries/render-utils/src/GeometryCache.cpp | 6 +++---
libraries/render-utils/src/SubsurfaceScattering.cpp | 10 +++++-----
libraries/render-utils/src/SurfaceGeometryPass.cpp | 6 +++---
libraries/render-utils/src/ToneMapAndResampleTask.cpp | 2 +-
libraries/render-utils/src/VelocityBufferPass.cpp | 2 +-
libraries/render-utils/src/ZoneRenderer.cpp | 6 +++---
libraries/render/src/render/BlurTask.cpp | 8 ++++----
libraries/render/src/render/DrawTask.cpp | 2 +-
libraries/render/src/render/ResampleTask.cpp | 6 +++---
.../script-engine/src/ModelScriptingInterface.cpp | 4 ++--
libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp | 2 +-
libraries/ui/src/ui/TabletScriptingInterface.cpp | 2 +-
plugins/hifiCodec/src/HiFiCodecProvider.cpp | 2 +-
plugins/hifiNeuron/src/NeuronProvider.cpp | 2 +-
plugins/hifiOsc/src/OscProvider.cpp | 2 +-
plugins/hifiSdl2/src/SDL2Provider.cpp | 2 +-
plugins/oculus/src/OculusProvider.cpp | 6 +++---
plugins/openvr/src/OpenVrProvider.cpp | 4 ++--
plugins/opusCodec/src/OpusCodecProvider.cpp | 2 +-
plugins/pcmCodec/src/PCMCodecProvider.cpp | 4 ++--
tools/gpu-frame-player/src/RenderThread.cpp | 2 +-
62 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/assignment-client/src/AssignmentDynamicFactory.cpp b/assignment-client/src/AssignmentDynamicFactory.cpp
index 88c7f6e06c..71c57be8e7 100644
--- a/assignment-client/src/AssignmentDynamicFactory.cpp
+++ b/assignment-client/src/AssignmentDynamicFactory.cpp
@@ -13,7 +13,7 @@
EntityDynamicPointer assignmentDynamicFactory(EntityDynamicType type, const QUuid& id, EntityItemPointer ownerEntity) {
- return EntityDynamicPointer(new AssignmentDynamic(type, id, ownerEntity));
+ return std::make_shared<AssignmentDynamic>(type, id, ownerEntity);
}
EntityDynamicPointer AssignmentDynamicFactory::factory(EntityDynamicType type,
diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index e68f95bda0..e6594e5fb0 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -94,7 +94,7 @@ std::unique_ptr<OctreeQueryNode> EntityServer::createOctreeQueryNode() {
}
OctreePointer EntityServer::createTree() {
- EntityTreePointer tree = EntityTreePointer(new EntityTree(true));
+ EntityTreePointer tree = std::make_shared<EntityTree>(true);
tree->createRootElement();
tree->addNewlyCreatedHook(this);
if (!_entitySimulation) {
diff --git a/assignment-client/src/entities/EntityTreeHeadlessViewer.h b/assignment-client/src/entities/EntityTreeHeadlessViewer.h
index a0f9930f06..118de58ae0 100644
--- a/assignment-client/src/entities/EntityTreeHeadlessViewer.h
+++ b/assignment-client/src/entities/EntityTreeHeadlessViewer.h
@@ -54,7 +54,7 @@ public:
protected:
virtual OctreePointer createTree() override {
- EntityTreePointer newTree = EntityTreePointer(new EntityTree(true));
+ EntityTreePointer newTree = std::make_shared<EntityTree>(true);
newTree->createRootElement();
return newTree;
}
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 7b04c72845..d055ff9699 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -834,7 +834,7 @@ bool DomainServerSettingsManager::ensurePermissionsForGroupRanks() {
if (_groupPermissions.contains(nameKey)) {
perms = _groupPermissions[nameKey];
} else {
- perms = NodePermissionsPointer(new NodePermissions(nameKey));
+ perms = std::make_shared<NodePermissions>(nameKey);
_groupPermissions[nameKey] = perms;
changed = true;
}
@@ -861,7 +861,7 @@ bool DomainServerSettingsManager::ensurePermissionsForGroupRanks() {
if (_groupForbiddens.contains(nameKey)) {
perms = _groupForbiddens[nameKey];
} else {
- perms = NodePermissionsPointer(new NodePermissions(nameKey));
+ perms = std::make_shared<NodePermissions>(nameKey);
_groupForbiddens[nameKey] = perms;
changed = true;
}
diff --git a/interface/src/raypick/ParabolaPointer.cpp b/interface/src/raypick/ParabolaPointer.cpp
index 959125ba7c..2c32be5d79 100644
--- a/interface/src/raypick/ParabolaPointer.cpp
+++ b/interface/src/raypick/ParabolaPointer.cpp
@@ -414,7 +414,7 @@ gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabo
};
for (auto& key : keys) {
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(true, !std::get<0>(key), gpu::LESS_EQUAL);
if (std::get<0>(key)) {
PrepareStencil::testMask(*state);
diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp
index 071da3696d..d9fd9fdaa1 100644
--- a/interface/src/ui/overlays/Overlays.cpp
+++ b/interface/src/ui/overlays/Overlays.cpp
@@ -786,11 +786,11 @@ QUuid Overlays::addOverlay(const QString& type, const QVariant& properties) {
Overlay::Pointer overlay;
if (type == ImageOverlay::TYPE) {
- overlay = Overlay::Pointer(new ImageOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
+ overlay = std::shared_ptr<ImageOverlay>(new ImageOverlay(), [](ImageOverlay* ptr) { ptr->deleteLater(); });
} else if (type == TextOverlay::TYPE) {
- overlay = Overlay::Pointer(new TextOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
+ overlay = std::shared_ptr<TextOverlay>(new TextOverlay(), [](TextOverlay* ptr) { ptr->deleteLater(); });
} else if (type == RectangleOverlay::TYPE) {
- overlay = Overlay::Pointer(new RectangleOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
+ overlay = std::shared_ptr<RectangleOverlay>(new RectangleOverlay(), [](RectangleOverlay* ptr) { ptr->deleteLater(); });
}
if (overlay) {
overlay->setProperties(properties.toMap());
diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp
index e4afbd06e4..f7112cff73 100644
--- a/libraries/animation/src/AnimationCache.cpp
+++ b/libraries/animation/src/AnimationCache.cpp
@@ -37,11 +37,11 @@ AnimationPointer AnimationCache::getAnimation(const QUrl& url) {
}
QSharedPointer<Resource> AnimationCache::createResource(const QUrl& url) {
- return QSharedPointer<Resource>(new Animation(url), &Resource::deleter);
+ return QSharedPointer<Animation>(new Animation(url), &Resource::deleter);
}
QSharedPointer<Resource> AnimationCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
- return QSharedPointer<Resource>(new Animation(*resource.staticCast<Animation>()), &Resource::deleter);
+ return QSharedPointer<Animation>(new Animation(*resource.staticCast<Animation>()), &Resource::deleter);
}
AnimationReader::AnimationReader(const QUrl& url, const QByteArray& data) :
diff --git a/libraries/audio/src/SoundCache.cpp b/libraries/audio/src/SoundCache.cpp
index c36897c766..2b02a566ac 100644
--- a/libraries/audio/src/SoundCache.cpp
+++ b/libraries/audio/src/SoundCache.cpp
@@ -34,11 +34,11 @@ SharedSoundPointer SoundCache::getSound(const QUrl& url) {
}
QSharedPointer<Resource> SoundCache::createResource(const QUrl& url) {
- auto resource = QSharedPointer<Resource>(new Sound(url), &Resource::deleter);
+ auto resource = QSharedPointer<Sound>(new Sound(url), &Resource::deleter);
resource->setLoadPriority(this, SOUNDS_LOADING_PRIORITY);
return resource;
}
QSharedPointer<Resource> SoundCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
- return QSharedPointer<Resource>(new Sound(*resource.staticCast<Sound>()), &Resource::deleter);
+ return QSharedPointer<Sound>(new Sound(*resource.staticCast<Sound>()), &Resource::deleter);
}
\ No newline at end of file
diff --git a/libraries/baking/src/MaterialBaker.cpp b/libraries/baking/src/MaterialBaker.cpp
index 9a1b1b2d24..540a2ee358 100644
--- a/libraries/baking/src/MaterialBaker.cpp
+++ b/libraries/baking/src/MaterialBaker.cpp
@@ -67,7 +67,7 @@ void MaterialBaker::loadMaterial() {
if (!_isURL) {
qCDebug(material_baking) << "Loading local material" << _materialData;
- _materialResource = NetworkMaterialResourcePointer(new NetworkMaterialResource());
+ _materialResource = QSharedPointer<NetworkMaterialResource>::create();
// TODO: add baseURL to allow these to reference relative files next to them
_materialResource->parsedMaterials = NetworkMaterialResource::parseJSONMaterials(QJsonDocument::fromJson(_materialData.toUtf8()), QUrl());
} else {
diff --git a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.cpp b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.cpp
index 1af3f271be..ff4725fb66 100644
--- a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.cpp
+++ b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.cpp
@@ -34,7 +34,7 @@ QObject* MappingBuilderProxy::from(const QScriptValue& source) {
QObject* MappingBuilderProxy::from(const Endpoint::Pointer& source) {
if (source) {
- auto route = Route::Pointer(new Route());
+ auto route = std::make_shared<Route>();
route->source = source;
return new RouteBuilderProxy(_parent, _mapping, route);
} else {
diff --git a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
index 56ace23335..91027a1a9c 100644
--- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
+++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
@@ -70,7 +70,7 @@ QObject* RouteBuilderProxy::when(const QScriptValue& expression) {
// Note that "!" is supported when parsing a JSON file, in UserInputMapper::parseConditional().
auto newConditional = _parent.conditionalFor(expression);
if (_route->conditional) {
- _route->conditional = ConditionalPointer(new AndConditional(_route->conditional, newConditional));
+ _route->conditional = std::make_shared<AndConditional>(_route->conditional, newConditional);
} else {
_route->conditional = newConditional;
}
@@ -80,7 +80,7 @@ QObject* RouteBuilderProxy::when(const QScriptValue& expression) {
QObject* RouteBuilderProxy::whenQml(const QJSValue& expression) {
auto newConditional = _parent.conditionalFor(expression);
if (_route->conditional) {
- _route->conditional = ConditionalPointer(new AndConditional(_route->conditional, newConditional));
+ _route->conditional = std::make_shared<AndConditional>(_route->conditional, newConditional);
} else {
_route->conditional = newConditional;
}
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index ba83ddff55..bf57e9a23c 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -382,7 +382,7 @@ void OpenGLDisplayPlugin::customizeContext() {
}
if (!_linearToSRGBPipeline) {
- gpu::StatePointer blendState = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer blendState = std::make_shared<gpu::State>();
blendState->setDepthTest(gpu::State::DepthTest(false));
blendState->setBlendFunction(true,
gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD,
@@ -390,7 +390,7 @@ void OpenGLDisplayPlugin::customizeContext() {
gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD,
gpu::State::ONE);
- gpu::StatePointer scissorState = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer scissorState = std::make_shared<gpu::State>();
scissorState->setDepthTest(gpu::State::DepthTest(false));
scissorState->setScissorEnable(true);
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 0c8b661980..2493f07436 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -419,7 +419,7 @@ void HmdDisplayPlugin::HUDRenderer::build() {
uniformsBuffer = std::make_shared<gpu::Buffer>(sizeof(Uniforms), nullptr);
auto program = gpu::Shader::createProgram(shader::render_utils::program::hmd_ui);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(true, true, gpu::LESS_EQUAL));
state->setBlendFunction(true,
gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
diff --git a/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp
index 0ae0f9b1b6..ad3ec51049 100644
--- a/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp
@@ -19,7 +19,7 @@ void InterleavedStereoDisplayPlugin::customizeContext() {
StereoDisplayPlugin::customizeContext();
if (!_interleavedPresentPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::display_plugins::program::InterleavedSrgbToLinear);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(false));
_interleavedPresentPipeline = gpu::Pipeline::create(program, state);
}
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.h b/libraries/entities-renderer/src/EntityTreeRenderer.h
index 009e5f6c4f..fe335e0914 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.h
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.h
@@ -162,7 +162,7 @@ public slots:
protected:
virtual OctreePointer createTree() override {
- EntityTreePointer newTree = EntityTreePointer(new EntityTree(true));
+ EntityTreePointer newTree = std::make_shared<EntityTree>(true);
newTree->createRootElement();
return newTree;
}
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 69bd752395..fa15168971 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -52,8 +52,8 @@ ModelPointer ModelEntityWrapper::getModel() const {
}
EntityItemPointer RenderableModelEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new RenderableModelEntityItem(entityID, properties.getDimensionsInitialized()),
- [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<RenderableModelEntityItem> entity(new RenderableModelEntityItem(entityID, properties.getDimensionsInitialized()),
+ [](RenderableModelEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index e4bb6952a7..aca501985a 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -79,7 +79,7 @@ void PolyLineEntityRenderer::buildPipelines() {
program = gpu::Shader::createProgram(shader::entities_renderer::program::paintStroke_forward);
}
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setCullMode(gpu::State::CullMode::CULL_NONE);
state->setDepthTest(true, !transparent, gpu::LESS_EQUAL);
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 5c8374b937..91c0a46dcd 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -1288,7 +1288,7 @@ void RenderablePolyVoxEntityItem::recomputeMesh() {
auto entity = std::static_pointer_cast<RenderablePolyVoxEntityItem>(getThisPointer());
QtConcurrent::run([entity, voxelSurfaceStyle] {
- graphics::MeshPointer mesh(new graphics::Mesh());
+ graphics::MeshPointer mesh(std::make_shared<graphics::Mesh>());
// A mesh object to hold the result of surface extraction
PolyVox::SurfaceMesh<PolyVox::PositionMaterialNormal> polyVoxMesh;
diff --git a/libraries/entities/src/LightEntityItem.cpp b/libraries/entities/src/LightEntityItem.cpp
index a3e00cddba..4bd9eda5ac 100644
--- a/libraries/entities/src/LightEntityItem.cpp
+++ b/libraries/entities/src/LightEntityItem.cpp
@@ -32,7 +32,7 @@ const float LightEntityItem::DEFAULT_CUTOFF = PI / 2.0f;
bool LightEntityItem::_lightsArePickable = false;
EntityItemPointer LightEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new LightEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<LightEntityItem> entity(new LightEntityItem(entityID), [](LightEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/entities/src/LineEntityItem.cpp b/libraries/entities/src/LineEntityItem.cpp
index f3304e716f..efb21b881e 100644
--- a/libraries/entities/src/LineEntityItem.cpp
+++ b/libraries/entities/src/LineEntityItem.cpp
@@ -24,7 +24,7 @@
const int LineEntityItem::MAX_POINTS_PER_LINE = 70;
EntityItemPointer LineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new LineEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<LineEntityItem> entity(new LineEntityItem(entityID), [](LineEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 321e92b9f0..45d41c3a7e 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -28,7 +28,7 @@ const QString ModelEntityItem::DEFAULT_MODEL_URL = QString("");
const QString ModelEntityItem::DEFAULT_COMPOUND_SHAPE_URL = QString("");
EntityItemPointer ModelEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new ModelEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<ModelEntityItem> entity(new ModelEntityItem(entityID), [](ModelEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/entities/src/ParticleEffectEntityItem.cpp b/libraries/entities/src/ParticleEffectEntityItem.cpp
index 5ccc209a54..b0cd6efc9d 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.cpp
+++ b/libraries/entities/src/ParticleEffectEntityItem.cpp
@@ -153,7 +153,7 @@ uint64_t Properties::emitIntervalUsecs() const {
}
EntityItemPointer ParticleEffectEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new ParticleEffectEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<ParticleEffectEntityItem> entity(new ParticleEffectEntityItem(entityID), [](ParticleEffectEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/entities/src/PolyLineEntityItem.cpp b/libraries/entities/src/PolyLineEntityItem.cpp
index 4aaf0ad521..605a171c7c 100644
--- a/libraries/entities/src/PolyLineEntityItem.cpp
+++ b/libraries/entities/src/PolyLineEntityItem.cpp
@@ -26,7 +26,7 @@ const float PolyLineEntityItem::DEFAULT_LINE_WIDTH = 0.1f;
const int PolyLineEntityItem::MAX_POINTS_PER_LINE = 60;
EntityItemPointer PolyLineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new PolyLineEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<PolyLineEntityItem> entity(new PolyLineEntityItem(entityID), [](PolyLineEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/entities/src/PolyVoxEntityItem.cpp b/libraries/entities/src/PolyVoxEntityItem.cpp
index 49dc0d7c90..dcbcd72d1f 100644
--- a/libraries/entities/src/PolyVoxEntityItem.cpp
+++ b/libraries/entities/src/PolyVoxEntityItem.cpp
@@ -47,7 +47,7 @@ const QString PolyVoxEntityItem::DEFAULT_Y_TEXTURE_URL = QString("");
const QString PolyVoxEntityItem::DEFAULT_Z_TEXTURE_URL = QString("");
EntityItemPointer PolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new PolyVoxEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<PolyVoxEntityItem> entity(new PolyVoxEntityItem(entityID), [](PolyVoxEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/entities/src/TextEntityItem.cpp b/libraries/entities/src/TextEntityItem.cpp
index 021e753710..160a608c23 100644
--- a/libraries/entities/src/TextEntityItem.cpp
+++ b/libraries/entities/src/TextEntityItem.cpp
@@ -32,7 +32,7 @@ const float TextEntityItem::DEFAULT_MARGIN = 0.0f;
const float TextEntityItem::DEFAULT_TEXT_EFFECT_THICKNESS = 0.2f;
EntityItemPointer TextEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new TextEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<TextEntityItem> entity(new TextEntityItem(entityID), [](TextEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/entities/src/WebEntityItem.cpp b/libraries/entities/src/WebEntityItem.cpp
index 2f8389fe2c..e090ec25ae 100644
--- a/libraries/entities/src/WebEntityItem.cpp
+++ b/libraries/entities/src/WebEntityItem.cpp
@@ -29,7 +29,7 @@ const QString WebEntityItem::DEFAULT_USER_AGENT = NetworkingConstants::WEB_ENTIT
const uint8_t WebEntityItem::DEFAULT_MAX_FPS = 10;
EntityItemPointer WebEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new WebEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<WebEntityItem> entity(new WebEntityItem(entityID), [](WebEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp
index abccdf7167..8ac5a4329c 100644
--- a/libraries/entities/src/ZoneEntityItem.cpp
+++ b/libraries/entities/src/ZoneEntityItem.cpp
@@ -33,7 +33,7 @@ const bool ZoneEntityItem::DEFAULT_GHOSTING_ALLOWED = true;
const QString ZoneEntityItem::DEFAULT_FILTER_URL = "";
EntityItemPointer ZoneEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
- EntityItemPointer entity(new ZoneEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+ std::shared_ptr<ZoneEntityItem> entity(new ZoneEntityItem(entityID), [](ZoneEntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
return entity;
}
diff --git a/libraries/gpu/src/gpu/Context.cpp b/libraries/gpu/src/gpu/Context.cpp
index 97b67586c6..8dee120555 100644
--- a/libraries/gpu/src/gpu/Context.cpp
+++ b/libraries/gpu/src/gpu/Context.cpp
@@ -347,7 +347,7 @@ Size Context::getTextureResourcePopulatedGPUMemSize() {
PipelinePointer Context::createMipGenerationPipeline(const ShaderPointer& ps) {
auto vs = gpu::Shader::createVertex(shader::gpu::vertex::DrawViewportQuadTransformTexcoord);
- static gpu::StatePointer state(new gpu::State());
+ static gpu::StatePointer state(std::make_shared<gpu::State>());
gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index ea0c5392c0..12c07d336d 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -237,7 +237,7 @@ scriptable::ScriptableMeshPointer GraphicsScriptingInterface::newMesh(const QVar
qCWarning(graphics_scripting) << "newMesh - texCoords1 not yet supported; ignoring";
}
- graphics::MeshPointer mesh(new graphics::Mesh());
+ graphics::MeshPointer mesh(std::make_shared<graphics::Mesh>());
mesh->modelName = "graphics::newMesh";
mesh->displayName = meshName.toStdString();
diff --git a/libraries/graphics/src/graphics/Geometry.cpp b/libraries/graphics/src/graphics/Geometry.cpp
index a983ba07b4..2f9f0a51e9 100755
--- a/libraries/graphics/src/graphics/Geometry.cpp
+++ b/libraries/graphics/src/graphics/Geometry.cpp
@@ -235,7 +235,7 @@ graphics::MeshPointer Mesh::map(std::function<glm::vec3(glm::vec3)> vertexFunc,
indexDataCursor += sizeof(index);
}
- graphics::MeshPointer result(new graphics::Mesh());
+ graphics::MeshPointer result(std::make_shared<graphics::Mesh>());
result->displayName = displayName;
gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
diff --git a/libraries/material-networking/src/material-networking/ShaderCache.cpp b/libraries/material-networking/src/material-networking/ShaderCache.cpp
index 4c8d659315..0b87b74ae3 100644
--- a/libraries/material-networking/src/material-networking/ShaderCache.cpp
+++ b/libraries/material-networking/src/material-networking/ShaderCache.cpp
@@ -25,9 +25,9 @@ NetworkShaderPointer ShaderCache::getShader(const QUrl& url) {
}
QSharedPointer<Resource> ShaderCache::createResource(const QUrl& url) {
- return QSharedPointer<Resource>(new NetworkShader(url), &Resource::deleter);
+ return QSharedPointer<NetworkShader>(new NetworkShader(url), &Resource::deleter);
}
QSharedPointer<Resource> ShaderCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
- return QSharedPointer<Resource>(new NetworkShader(*resource.staticCast<NetworkShader>()), &Resource::deleter);
+ return QSharedPointer<NetworkShader>(new NetworkShader(*resource.staticCast<NetworkShader>()), &Resource::deleter);
}
diff --git a/libraries/material-networking/src/material-networking/TextureCache.cpp b/libraries/material-networking/src/material-networking/TextureCache.cpp
index 0307e38cc9..496b00ae2c 100644
--- a/libraries/material-networking/src/material-networking/TextureCache.cpp
+++ b/libraries/material-networking/src/material-networking/TextureCache.cpp
@@ -366,11 +366,11 @@ gpu::TexturePointer TextureCache::getImageTexture(const QString& path, image::Te
}
QSharedPointer<Resource> TextureCache::createResource(const QUrl& url) {
- return QSharedPointer<Resource>(new NetworkTexture(url), &Resource::deleter);
+ return QSharedPointer<NetworkTexture>(new NetworkTexture(url), &Resource::deleter);
}
QSharedPointer<Resource> TextureCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
- return QSharedPointer<Resource>(new NetworkTexture(*resource.staticCast<NetworkTexture>()), &Resource::deleter);
+ return QSharedPointer<NetworkTexture>(new NetworkTexture(*resource.staticCast<NetworkTexture>()), &Resource::deleter);
}
int networkTexturePointerMetaTypeId = qRegisterMetaType<QWeakPointer<NetworkTexture>>();
@@ -1390,7 +1390,7 @@ NetworkTexturePointer TextureCache::getTextureByUUID(const QString& uuid) {
if (!quuid.isNull()) {
// We mark this as a resource texture because it's just a reference to another texture. The source
// texture will be marked properly
- NetworkTexturePointer toReturn = NetworkTexturePointer(new NetworkTexture(uuid, true));
+ NetworkTexturePointer toReturn = NetworkTexturePointer::create(uuid, true);
toReturn->setImageOperator(Texture::getTextureForUUIDOperator(uuid));
return toReturn;
}
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 1fcfcfcc70..ef827b3145 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -377,11 +377,11 @@ ModelCache::ModelCache() {
}
QSharedPointer<Resource> ModelCache::createResource(const QUrl& url) {
- return QSharedPointer<Resource>(new GeometryResource(url, _modelLoader), &GeometryResource::deleter);
+ return QSharedPointer<GeometryResource>(new GeometryResource(url, _modelLoader), &GeometryResource::deleter);
}
QSharedPointer<Resource> ModelCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
- return QSharedPointer<Resource>(new GeometryResource(*resource.staticCast<GeometryResource>()), &GeometryResource::deleter);
+ return QSharedPointer<GeometryResource>(new GeometryResource(*resource.staticCast<GeometryResource>()), &GeometryResource::deleter);
}
GeometryResource::Pointer ModelCache::getGeometryResource(const QUrl& url, const GeometryMappingPair& mapping, const QUrl& textureBaseUrl) {
diff --git a/libraries/networking/src/NodePermissions.h b/libraries/networking/src/NodePermissions.h
index e3bfc69d07..0c66c4f56a 100644
--- a/libraries/networking/src/NodePermissions.h
+++ b/libraries/networking/src/NodePermissions.h
@@ -119,7 +119,7 @@ public:
NodePermissionsPointer& operator[](const NodePermissionsKey& key) {
NodePermissionsKey dataKey(key.first.toLower(), key.second);
if (0 == _data.count(dataKey)) {
- _data[dataKey] = NodePermissionsPointer(new NodePermissions(key));
+ _data[dataKey] = std::make_shared<NodePermissions>(key);
}
return _data[dataKey];
}
diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp
index 784de6bdea..f7ac9b35af 100644
--- a/libraries/plugins/src/plugins/PluginManager.cpp
+++ b/libraries/plugins/src/plugins/PluginManager.cpp
@@ -124,7 +124,7 @@ int PluginManager::instantiate() {
for (auto plugin : candidates) {
qCDebug(plugins) << "Attempting plugin" << qPrintable(plugin);
- QSharedPointer<QPluginLoader> loader(new QPluginLoader(pluginPath + plugin));
+ auto loader = QSharedPointer<QPluginLoader>::create(pluginPath + plugin);
const QJsonObject pluginMetaData = loader->metaData();
#if defined(HIFI_PLUGINMANAGER_DEBUG)
QJsonDocument metaDataDoc(pluginMetaData);
diff --git a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
index d99f74769c..f175a65452 100644
--- a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
+++ b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
@@ -581,11 +581,11 @@ NetworkMaterialResourcePointer MaterialCache::getMaterial(const QUrl& url) {
}
QSharedPointer<Resource> MaterialCache::createResource(const QUrl& url) {
- return QSharedPointer<Resource>(new NetworkMaterialResource(url), &Resource::deleter);
+ return QSharedPointer<NetworkMaterialResource>(new NetworkMaterialResource(url), &Resource::deleter);
}
QSharedPointer<Resource> MaterialCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
- return QSharedPointer<Resource>(new NetworkMaterialResource(*resource.staticCast<NetworkMaterialResource>()), &Resource::deleter);
+ return QSharedPointer<NetworkMaterialResource>(new NetworkMaterialResource(*resource.staticCast<NetworkMaterialResource>()), &Resource::deleter);
}
NetworkMaterial::NetworkMaterial(const NetworkMaterial& m) :
diff --git a/libraries/recording/src/recording/ClipCache.cpp b/libraries/recording/src/recording/ClipCache.cpp
index 0fc65a2d79..285b5b7acf 100644
--- a/libraries/recording/src/recording/ClipCache.cpp
+++ b/libraries/recording/src/recording/ClipCache.cpp
@@ -56,9 +56,9 @@ NetworkClipLoaderPointer ClipCache::getClipLoader(const QUrl& url) {
QSharedPointer<Resource> ClipCache::createResource(const QUrl& url) {
qCDebug(recordingLog) << "Loading recording at" << url;
- return QSharedPointer<Resource>(new NetworkClipLoader(url), &Resource::deleter);
+ return QSharedPointer<NetworkClipLoader>(new NetworkClipLoader(url), &Resource::deleter);
}
QSharedPointer<Resource> ClipCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
- return QSharedPointer<Resource>(new NetworkClipLoader(*resource.staticCast<NetworkClipLoader>()), &Resource::deleter);
+ return QSharedPointer<NetworkClipLoader>(new NetworkClipLoader(*resource.staticCast<NetworkClipLoader>()), &Resource::deleter);
}
\ No newline at end of file
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
index fd0d2c2522..68eb1b5a06 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
@@ -521,7 +521,7 @@ void AmbientOcclusionEffect::updateFramebufferSizes() {
const gpu::PipelinePointer& AmbientOcclusionEffect::getOcclusionPipeline() {
if (!_occlusionPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::ssao_makeOcclusion);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setColorWriteMask(true, true, true, true);
@@ -534,7 +534,7 @@ const gpu::PipelinePointer& AmbientOcclusionEffect::getOcclusionPipeline() {
const gpu::PipelinePointer& AmbientOcclusionEffect::getBilateralBlurPipeline() {
if (!_bilateralBlurPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::ssao_bilateralBlur);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setColorWriteMask(true, true, true, false);
@@ -554,7 +554,7 @@ const gpu::PipelinePointer& AmbientOcclusionEffect::getMipCreationPipeline() {
const gpu::PipelinePointer& AmbientOcclusionEffect::getGatherPipeline() {
if (!_gatherPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::ssao_gather);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setColorWriteMask(true, true, true, true);
@@ -567,7 +567,7 @@ const gpu::PipelinePointer& AmbientOcclusionEffect::getGatherPipeline() {
const gpu::PipelinePointer& AmbientOcclusionEffect::getBuildNormalsPipeline() {
if (!_buildNormalsPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::ssao_buildNormals);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setColorWriteMask(true, true, true, true);
@@ -847,7 +847,7 @@ void DebugAmbientOcclusion::configure(const Config& config) {
const gpu::PipelinePointer& DebugAmbientOcclusion::getDebugPipeline() {
if (!_debugPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::ssao_debugOcclusion);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setColorWriteMask(true, true, true, false);
state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp
index c9da8373db..b7043d26de 100644
--- a/libraries/render-utils/src/AntialiasingEffect.cpp
+++ b/libraries/render-utils/src/AntialiasingEffect.cpp
@@ -54,7 +54,7 @@ Antialiasing::~Antialiasing() {
const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline() {
if (!_antialiasingPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::fxaa);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(false, false, gpu::LESS_EQUAL);
PrepareStencil::testNoAA(*state);
@@ -69,7 +69,7 @@ const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline() {
const gpu::PipelinePointer& Antialiasing::getBlendPipeline() {
if (!_blendPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::fxaa_blend);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(false, false, gpu::LESS_EQUAL);
PrepareStencil::testNoAA(*state);
@@ -158,7 +158,7 @@ const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline(const render::
if (!_antialiasingPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::taa);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
PrepareStencil::testNoAA(*state);
@@ -172,7 +172,7 @@ const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline(const render::
const gpu::PipelinePointer& Antialiasing::getBlendPipeline() {
if (!_blendPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::fxaa_blend);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
PrepareStencil::testNoAA(*state);
// Good to go add the brand new pipeline
_blendPipeline = gpu::Pipeline::create(program, state);
@@ -183,7 +183,7 @@ const gpu::PipelinePointer& Antialiasing::getBlendPipeline() {
const gpu::PipelinePointer& Antialiasing::getDebugBlendPipeline() {
if (!_debugBlendPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::taa_blend);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
PrepareStencil::testNoAA(*state);
diff --git a/libraries/render-utils/src/BloomEffect.cpp b/libraries/render-utils/src/BloomEffect.cpp
index 0c499a9d34..5cb2f06021 100644
--- a/libraries/render-utils/src/BloomEffect.cpp
+++ b/libraries/render-utils/src/BloomEffect.cpp
@@ -68,7 +68,7 @@ void BloomThreshold::run(const render::RenderContextPointer& renderContext, cons
if (!_pipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::bloomThreshold);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
_pipeline = gpu::Pipeline::create(program, state);
}
@@ -113,7 +113,7 @@ void BloomApply::run(const render::RenderContextPointer& renderContext, const In
if (!_pipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::bloomApply);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(false, false));
_pipeline = gpu::Pipeline::create(program, state);
}
@@ -164,7 +164,7 @@ void BloomDraw::run(const render::RenderContextPointer& renderContext, const Inp
if (!_pipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::drawTransformUnitQuadTextureOpaque);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(false, false));
state->setBlendFunction(true, gpu::State::ONE, gpu::State::BLEND_OP_ADD, gpu::State::ONE,
gpu::State::ZERO, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
@@ -225,7 +225,7 @@ void DebugBloom::run(const render::RenderContextPointer& renderContext, const In
if (!_pipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::drawTextureOpaqueTexcoordRect);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(false));
_pipeline = gpu::Pipeline::create(program, state);
}
diff --git a/libraries/render-utils/src/DrawHaze.cpp b/libraries/render-utils/src/DrawHaze.cpp
index f7be5160b6..012161ec03 100644
--- a/libraries/render-utils/src/DrawHaze.cpp
+++ b/libraries/render-utils/src/DrawHaze.cpp
@@ -55,7 +55,7 @@ void DrawHaze::run(const render::RenderContextPointer& renderContext, const Inpu
if (!_hazePipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::haze);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setBlendFunction(true,
gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index af33899617..4ac097e31d 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -2024,7 +2024,7 @@ void GeometryCache::useGridPipeline(gpu::Batch& batch, GridBuffer gridBuffer, bo
};
for (auto& key : keys) {
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(true, !std::get<0>(key), gpu::LESS_EQUAL);
if (std::get<0>(key)) {
PrepareStencil::testMask(*state);
@@ -2132,7 +2132,7 @@ gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent, bool
// For any non-opaque or non-deferred pipeline, we use web_browser_forward
auto pipeline = (transparent || forward) ? web_browser_forward : web_browser;
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(true, !transparent, gpu::LESS_EQUAL);
// FIXME: do we need a testMaskDrawNoAA?
PrepareStencil::testMaskDrawShapeNoAA(*state);
@@ -2419,7 +2419,7 @@ graphics::MeshPointer GeometryCache::meshFromShape(Shape geometryShape, glm::vec
colorsBufferView.edit<glm::vec3>((gpu::BufferView::Index)i) = color;
}
- graphics::MeshPointer mesh(new graphics::Mesh());
+ graphics::MeshPointer mesh(std::make_shared<graphics::Mesh>());
mesh->setVertexBuffer(positionsBufferView);
mesh->setIndexBuffer(indexBufferView);
mesh->addAttribute(gpu::Stream::NORMAL, normalsBufferView);
diff --git a/libraries/render-utils/src/SubsurfaceScattering.cpp b/libraries/render-utils/src/SubsurfaceScattering.cpp
index e004e66501..b5f8916ef6 100644
--- a/libraries/render-utils/src/SubsurfaceScattering.cpp
+++ b/libraries/render-utils/src/SubsurfaceScattering.cpp
@@ -301,7 +301,7 @@ void diffuseProfileGPU(gpu::TexturePointer& profileMap, RenderArgs* args) {
{
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::subsurfaceScattering_makeProfile);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
makePipeline = gpu::Pipeline::create(program, state);
}
@@ -330,7 +330,7 @@ void diffuseScatterGPU(const gpu::TexturePointer& profileMap, gpu::TexturePointe
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::subsurfaceScattering_makeLUT);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
gpu::PipelinePointer makePipeline = gpu::Pipeline::create(program, state);
@@ -359,7 +359,7 @@ void computeSpecularBeckmannGPU(gpu::TexturePointer& beckmannMap, RenderArgs* ar
{
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::subsurfaceScattering_makeSpecularBeckmann);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
makePipeline = gpu::Pipeline::create(program, state);
}
@@ -432,7 +432,7 @@ void DebugSubsurfaceScattering::configure(const Config& config) {
gpu::PipelinePointer DebugSubsurfaceScattering::getScatteringPipeline() {
if (!_scatteringPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::subsurfaceScattering_drawScattering);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
_scatteringPipeline = gpu::Pipeline::create(program, state);
}
@@ -445,7 +445,7 @@ gpu::PipelinePointer _showLUTPipeline;
gpu::PipelinePointer DebugSubsurfaceScattering::getShowLUTPipeline() {
if (!_showLUTPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::drawUnitQuatTextureOpaque);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
_showLUTPipeline = gpu::Pipeline::create(program, state);
}
diff --git a/libraries/render-utils/src/SurfaceGeometryPass.cpp b/libraries/render-utils/src/SurfaceGeometryPass.cpp
index 83595b5a64..1572e8987f 100644
--- a/libraries/render-utils/src/SurfaceGeometryPass.cpp
+++ b/libraries/render-utils/src/SurfaceGeometryPass.cpp
@@ -228,7 +228,7 @@ const gpu::PipelinePointer& LinearDepthPass::getLinearDepthPipeline(const render
if (!_linearDepthPipeline) {
program = gpu::Shader::createProgram(shader::render_utils::program::surfaceGeometry_makeLinearDepth);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
// Stencil test the curvature pass for objects pixels only, not the background
PrepareStencil::testShape(*state);
@@ -248,7 +248,7 @@ const gpu::PipelinePointer& LinearDepthPass::getDownsamplePipeline(const render:
if (!_downsamplePipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::surfaceGeometry_downsampleDepthNormal);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
PrepareStencil::testShape(*state);
state->setColorWriteMask(true, true, true, false);
@@ -536,7 +536,7 @@ const gpu::PipelinePointer& SurfaceGeometryPass::getCurvaturePipeline(const rend
if (!_curvaturePipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::surfaceGeometry_makeCurvature);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
#ifdef USE_STENCIL_TEST
// Stencil test the curvature pass for objects pixels only, not the background
diff --git a/libraries/render-utils/src/ToneMapAndResampleTask.cpp b/libraries/render-utils/src/ToneMapAndResampleTask.cpp
index 8d4a3c485d..10312f7f2e 100644
--- a/libraries/render-utils/src/ToneMapAndResampleTask.cpp
+++ b/libraries/render-utils/src/ToneMapAndResampleTask.cpp
@@ -32,7 +32,7 @@ ToneMapAndResample::ToneMapAndResample() {
void ToneMapAndResample::init() {
// shared_ptr to gpu::State
- gpu::StatePointer blitState = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer blitState = std::make_shared<gpu::State>();
blitState->setDepthTest(gpu::State::DepthTest(false, false));
blitState->setColorWriteMask(true, true, true, true);
diff --git a/libraries/render-utils/src/VelocityBufferPass.cpp b/libraries/render-utils/src/VelocityBufferPass.cpp
index 5833089967..9437ead3b2 100644
--- a/libraries/render-utils/src/VelocityBufferPass.cpp
+++ b/libraries/render-utils/src/VelocityBufferPass.cpp
@@ -147,7 +147,7 @@ void VelocityBufferPass::run(const render::RenderContextPointer& renderContext,
const gpu::PipelinePointer& VelocityBufferPass::getCameraMotionPipeline(const render::RenderContextPointer& renderContext) {
if (!_cameraMotionPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::velocityBuffer_cameraMotion);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
// Stencil test the curvature pass for objects pixels only, not the background
// PrepareStencil::testShape(*state);
diff --git a/libraries/render-utils/src/ZoneRenderer.cpp b/libraries/render-utils/src/ZoneRenderer.cpp
index e1606ba9f8..5332e13816 100644
--- a/libraries/render-utils/src/ZoneRenderer.cpp
+++ b/libraries/render-utils/src/ZoneRenderer.cpp
@@ -85,7 +85,7 @@ void SetupZones::run(const RenderContextPointer& context, const Input& input) {
const gpu::PipelinePointer& DebugZoneLighting::getKeyLightPipeline() {
if (!_keyLightPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::zone_drawKeyLight);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
PrepareStencil::testMask(*state);
state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
@@ -97,7 +97,7 @@ const gpu::PipelinePointer& DebugZoneLighting::getKeyLightPipeline() {
const gpu::PipelinePointer& DebugZoneLighting::getAmbientPipeline() {
if (!_ambientPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::zone_drawAmbient);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
PrepareStencil::testMask(*state);
state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
@@ -108,7 +108,7 @@ const gpu::PipelinePointer& DebugZoneLighting::getAmbientPipeline() {
const gpu::PipelinePointer& DebugZoneLighting::getBackgroundPipeline() {
if (!_backgroundPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::zone_drawSkybox);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
PrepareStencil::testMask(*state);
state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
diff --git a/libraries/render/src/render/BlurTask.cpp b/libraries/render/src/render/BlurTask.cpp
index edbfbdaff0..97445e48df 100644
--- a/libraries/render/src/render/BlurTask.cpp
+++ b/libraries/render/src/render/BlurTask.cpp
@@ -202,7 +202,7 @@ BlurGaussian::BlurGaussian() {
gpu::PipelinePointer BlurGaussian::getBlurVPipeline() {
if (!_blurVPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render::program::blurGaussianV);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
// Stencil test the curvature pass for objects pixels only, not the background
// state->setStencilTest(true, 0xFF, gpu::State::StencilTest(0, 0xFF, gpu::NOT_EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
@@ -216,7 +216,7 @@ gpu::PipelinePointer BlurGaussian::getBlurVPipeline() {
gpu::PipelinePointer BlurGaussian::getBlurHPipeline() {
if (!_blurHPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render::program::blurGaussianH);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
// Stencil test the curvature pass for objects pixels only, not the background
// state->setStencilTest(true, 0xFF, gpu::State::StencilTest(0, 0xFF, gpu::NOT_EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
@@ -305,7 +305,7 @@ BlurGaussianDepthAware::BlurGaussianDepthAware(bool generateOutputFramebuffer, c
gpu::PipelinePointer BlurGaussianDepthAware::getBlurVPipeline() {
if (!_blurVPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render::program::blurGaussianDepthAwareV);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
// Stencil test the curvature pass for objects pixels only, not the background
// state->setStencilTest(true, 0xFF, gpu::State::StencilTest(0, 0xFF, gpu::NOT_EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
@@ -319,7 +319,7 @@ gpu::PipelinePointer BlurGaussianDepthAware::getBlurVPipeline() {
gpu::PipelinePointer BlurGaussianDepthAware::getBlurHPipeline() {
if (!_blurHPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render::program::blurGaussianDepthAwareH);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
// Stencil test the curvature pass for objects pixels only, not the background
// state->setStencilTest(true, 0xFF, gpu::State::StencilTest(0, 0xFF, gpu::NOT_EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp
index 0ec643ac39..68a87ca53c 100755
--- a/libraries/render/src/render/DrawTask.cpp
+++ b/libraries/render/src/render/DrawTask.cpp
@@ -268,7 +268,7 @@ gpu::PipelinePointer DrawQuadVolume::getPipeline() {
if (!pipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::drawColor);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(true, false));
pipeline = gpu::Pipeline::create(program, state);
}
diff --git a/libraries/render/src/render/ResampleTask.cpp b/libraries/render/src/render/ResampleTask.cpp
index b3d4b38d02..b868c53542 100644
--- a/libraries/render/src/render/ResampleTask.cpp
+++ b/libraries/render/src/render/ResampleTask.cpp
@@ -53,7 +53,7 @@ void HalfDownsample::run(const RenderContextPointer& renderContext, const gpu::F
if (!_pipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::drawTransformUnitQuadTextureOpaque);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(false, false));
_pipeline = gpu::Pipeline::create(program, state);
}
@@ -109,7 +109,7 @@ void Upsample::run(const RenderContextPointer& renderContext, const gpu::Framebu
if (resampledFrameBuffer != sourceFramebuffer) {
if (!_pipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::drawTransformUnitQuadTextureOpaque);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(false, false));
_pipeline = gpu::Pipeline::create(program, state);
}
@@ -150,7 +150,7 @@ void UpsampleToBlitFramebuffer::run(const RenderContextPointer& renderContext, c
if (resampledFrameBuffer != sourceFramebuffer) {
if (!_pipeline) {
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
state->setDepthTest(gpu::State::DepthTest(false, false));
_pipeline = gpu::Pipeline::create(gpu::Shader::createProgram(drawTransformUnitQuadTextureOpaque), state);
diff --git a/libraries/script-engine/src/ModelScriptingInterface.cpp b/libraries/script-engine/src/ModelScriptingInterface.cpp
index 1716ea72ff..499678ff06 100644
--- a/libraries/script-engine/src/ModelScriptingInterface.cpp
+++ b/libraries/script-engine/src/ModelScriptingInterface.cpp
@@ -102,7 +102,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) {
indexStartOffset += numVertices;
}
- graphics::MeshPointer result(new graphics::Mesh());
+ graphics::MeshPointer result(std::make_shared<graphics::Mesh>());
gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
gpu::Buffer* combinedVertexBuffer = new gpu::Buffer(combinedVertexSize, combinedVertexData.get());
@@ -199,7 +199,7 @@ QScriptValue ModelScriptingInterface::getVertex(MeshProxy* meshProxy, int vertex
QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,
const QVector<glm::vec3>& normals,
const QVector<MeshFace>& faces) {
- graphics::MeshPointer mesh(new graphics::Mesh());
+ graphics::MeshPointer mesh(std::make_shared<graphics::Mesh>());
// vertices
auto vertexBuffer = std::make_shared<gpu::Buffer>(vertices.size() * sizeof(glm::vec3), (gpu::Byte*)vertices.data());
diff --git a/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp b/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
index 6911c34e2a..ff5ea2c732 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
@@ -45,7 +45,7 @@ void OffscreenQmlSurfaceCache::release(const QString& rootSource, const QSharedP
}
QSharedPointer<OffscreenQmlSurface> OffscreenQmlSurfaceCache::buildSurface(const QString& rootSource) {
- auto surface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface());
+ auto surface = QSharedPointer<OffscreenQmlSurface>::create();
QObject::connect(surface.data(), &hifi::qml::OffscreenSurface::rootContextCreated, [this, rootSource](QQmlContext* surfaceContext) {
if (_onRootContextCreated) {
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp
index 82c9c43ce1..68730e186f 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.cpp
+++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp
@@ -82,7 +82,7 @@ TabletButtonProxy* TabletButtonListModel::addButton(const QVariant& properties)
newProperties[BUTTON_SORT_ORDER_KEY] = DEFAULT_BUTTON_SORT_ORDER;
}
int index = computeNewButtonIndex(newProperties);
- auto button = QSharedPointer<TabletButtonProxy>(new TabletButtonProxy(newProperties));
+ auto button = QSharedPointer<TabletButtonProxy>::create(newProperties);
beginResetModel();
int numButtons = (int)_buttons.size();
if (index < numButtons) {
diff --git a/plugins/hifiCodec/src/HiFiCodecProvider.cpp b/plugins/hifiCodec/src/HiFiCodecProvider.cpp
index b9698cc821..70b29e1b08 100644
--- a/plugins/hifiCodec/src/HiFiCodecProvider.cpp
+++ b/plugins/hifiCodec/src/HiFiCodecProvider.cpp
@@ -30,7 +30,7 @@ public:
static std::once_flag once;
std::call_once(once, [&] {
- CodecPluginPointer hiFiCodec(new HiFiCodec());
+ CodecPluginPointer hiFiCodec(std::make_shared<HiFiCodec>());
if (hiFiCodec->isSupported()) {
_codecPlugins.push_back(hiFiCodec);
}
diff --git a/plugins/hifiNeuron/src/NeuronProvider.cpp b/plugins/hifiNeuron/src/NeuronProvider.cpp
index 5315ff105e..d5d6aff24a 100644
--- a/plugins/hifiNeuron/src/NeuronProvider.cpp
+++ b/plugins/hifiNeuron/src/NeuronProvider.cpp
@@ -30,7 +30,7 @@ public:
virtual InputPluginList getInputPlugins() override {
static std::once_flag once;
std::call_once(once, [&] {
- InputPluginPointer plugin(new NeuronPlugin());
+ InputPluginPointer plugin(std::make_shared<NeuronPlugin>());
if (plugin->isSupported()) {
_inputPlugins.push_back(plugin);
}
diff --git a/plugins/hifiOsc/src/OscProvider.cpp b/plugins/hifiOsc/src/OscProvider.cpp
index 0d4c582d16..e4e5257bc2 100644
--- a/plugins/hifiOsc/src/OscProvider.cpp
+++ b/plugins/hifiOsc/src/OscProvider.cpp
@@ -30,7 +30,7 @@ public:
virtual InputPluginList getInputPlugins() override {
static std::once_flag once;
std::call_once(once, [&] {
- InputPluginPointer plugin(new OscPlugin());
+ InputPluginPointer plugin(std::make_shared<OscPlugin>());
if (plugin->isSupported()) {
_inputPlugins.push_back(plugin);
}
diff --git a/plugins/hifiSdl2/src/SDL2Provider.cpp b/plugins/hifiSdl2/src/SDL2Provider.cpp
index c3315dee07..8def52bdec 100644
--- a/plugins/hifiSdl2/src/SDL2Provider.cpp
+++ b/plugins/hifiSdl2/src/SDL2Provider.cpp
@@ -29,7 +29,7 @@ public:
virtual InputPluginList getInputPlugins() override {
static std::once_flag once;
std::call_once(once, [&] {
- InputPluginPointer plugin(new SDL2Manager());
+ InputPluginPointer plugin(std::make_shared<SDL2Manager>());
if (plugin->isSupported()) {
_inputPlugins.push_back(plugin);
}
diff --git a/plugins/oculus/src/OculusProvider.cpp b/plugins/oculus/src/OculusProvider.cpp
index 67871b8610..1e39b971c8 100644
--- a/plugins/oculus/src/OculusProvider.cpp
+++ b/plugins/oculus/src/OculusProvider.cpp
@@ -38,7 +38,7 @@ public:
virtual DisplayPluginList getDisplayPlugins() override {
static std::once_flag once;
std::call_once(once, [&] {
- DisplayPluginPointer plugin(new OculusDisplayPlugin());
+ DisplayPluginPointer plugin(std::make_shared<OculusDisplayPlugin>());
if (plugin->isSupported()) {
_displayPlugins.push_back(plugin);
}
@@ -46,7 +46,7 @@ public:
// Windows Oculus Simulator... uses head tracking and the same rendering
// as the connected hardware, but without using the SDK to display to the
// Rift. Useful for debugging Rift performance with nSight.
- plugin = DisplayPluginPointer(new OculusDebugDisplayPlugin());
+ plugin = std::make_shared<OculusDebugDisplayPlugin>();
if (plugin->isSupported()) {
_displayPlugins.push_back(plugin);
}
@@ -57,7 +57,7 @@ public:
virtual InputPluginList getInputPlugins() override {
static std::once_flag once;
std::call_once(once, [&] {
- InputPluginPointer plugin(new OculusControllerManager());
+ InputPluginPointer plugin(std::make_shared<OculusControllerManager>());
if (plugin->isSupported()) {
_inputPlugins.push_back(plugin);
}
diff --git a/plugins/openvr/src/OpenVrProvider.cpp b/plugins/openvr/src/OpenVrProvider.cpp
index 944322373a..46ff161a6f 100644
--- a/plugins/openvr/src/OpenVrProvider.cpp
+++ b/plugins/openvr/src/OpenVrProvider.cpp
@@ -32,7 +32,7 @@ public:
virtual DisplayPluginList getDisplayPlugins() override {
static std::once_flag once;
std::call_once(once, [&] {
- DisplayPluginPointer plugin(new OpenVrDisplayPlugin());
+ DisplayPluginPointer plugin(std::make_shared<OpenVrDisplayPlugin>());
if (plugin->isSupported()) {
_displayPlugins.push_back(plugin);
}
@@ -43,7 +43,7 @@ public:
virtual InputPluginList getInputPlugins() override {
static std::once_flag once;
std::call_once(once, [&] {
- InputPluginPointer plugin(new ViveControllerManager());
+ InputPluginPointer plugin(std::make_shared<ViveControllerManager>());
if (plugin->isSupported()) {
_inputPlugins.push_back(plugin);
}
diff --git a/plugins/opusCodec/src/OpusCodecProvider.cpp b/plugins/opusCodec/src/OpusCodecProvider.cpp
index 79f01de4bd..25c7b3c7c9 100644
--- a/plugins/opusCodec/src/OpusCodecProvider.cpp
+++ b/plugins/opusCodec/src/OpusCodecProvider.cpp
@@ -30,7 +30,7 @@ public:
static std::once_flag once;
std::call_once(once, [&] {
- CodecPluginPointer opusCodec(new AthenaOpusCodec());
+ CodecPluginPointer opusCodec(std::make_shared<AthenaOpusCodec>());
if (opusCodec->isSupported()) {
_codecPlugins.push_back(opusCodec);
}
diff --git a/plugins/pcmCodec/src/PCMCodecProvider.cpp b/plugins/pcmCodec/src/PCMCodecProvider.cpp
index 351b1adf3f..dded40bfc9 100644
--- a/plugins/pcmCodec/src/PCMCodecProvider.cpp
+++ b/plugins/pcmCodec/src/PCMCodecProvider.cpp
@@ -30,12 +30,12 @@ public:
static std::once_flag once;
std::call_once(once, [&] {
- CodecPluginPointer pcmCodec(new PCMCodec());
+ CodecPluginPointer pcmCodec(std::make_shared<PCMCodec>());
if (pcmCodec->isSupported()) {
_codecPlugins.push_back(pcmCodec);
}
- CodecPluginPointer zlibCodec(new zLibCodec());
+ CodecPluginPointer zlibCodec(std::make_shared<zLibCodec>());
if (zlibCodec->isSupported()) {
_codecPlugins.push_back(zlibCodec);
}
diff --git a/tools/gpu-frame-player/src/RenderThread.cpp b/tools/gpu-frame-player/src/RenderThread.cpp
index 31e154d38c..0089c1577b 100644
--- a/tools/gpu-frame-player/src/RenderThread.cpp
+++ b/tools/gpu-frame-player/src/RenderThread.cpp
@@ -54,7 +54,7 @@ void RenderThread::initialize(QWindow* window) {
if (!_presentPipeline) {
gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::DrawTexture);
- gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+ gpu::StatePointer state = std::make_shared<gpu::State>();
_presentPipeline = gpu::Pipeline::create(program, state);
}
#else