Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-09 01:22:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIXUP: libraries: Missing buffer usage constructors.

Browse source
This commit is contained in:
Lubosz Sarnecki 2024-03-29 10:08:21 +01:00 committed by Karol Suprynowicz
parent a57fa2a157
commit ba7a397e0c
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableMaterialEntityItem.h
View file

@ -67,7 +67,7 @@ private:
std::shared_ptr<NetworkMaterial> _appliedMaterial;
std::string _currentMaterialName;
gpu::BufferPointer _colorBuffer { std::make_shared<gpu::Buffer>() };
gpu::BufferPointer _colorBuffer { std::make_shared<gpu::Buffer>(gpu::Buffer::VertexBuffer) };
};
} }

2
libraries/entities-renderer/src/RenderableShapeEntityItem.h
View file

@ -44,7 +44,7 @@ private:
float _alpha { NAN };
bool _unlit { false };
gpu::BufferPointer _colorBuffer { std::make_shared<gpu::Buffer>() };
gpu::BufferPointer _colorBuffer { std::make_shared<gpu::Buffer>(gpu::Buffer::VertexBuffer) };
};
} }

2
libraries/graphics/src/graphics/Geometry.h
View file

@ -156,7 +156,7 @@ protected:
BufferView _partBuffer;
gpu::BufferPointer _colorBuffer { std::make_shared<gpu::Buffer>() };
gpu::BufferPointer _colorBuffer { std::make_shared<gpu::Buffer>(gpu::Buffer::VertexBuffer) };
void evalVertexFormat();
void evalVertexStream();

4
libraries/graphics/src/graphics/Material.cpp
View file

@ -341,10 +341,10 @@ void MultiMaterial::setisMToon(bool isMToon) {
if (isMToon != _isMToon) {
if (isMToon) {
MToonSchema toonSchema;
_schemaBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(MToonSchema), (const gpu::Byte*) &toonSchema, sizeof(MToonSchema)));
_schemaBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(gpu::Buffer::UniformBuffer, sizeof(MToonSchema), (const gpu::Byte*) &toonSchema, sizeof(MToonSchema)));
} else {
Schema schema;
_schemaBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Schema), (const gpu::Byte*) &schema, sizeof(Schema)));
_schemaBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(gpu::Buffer::UniformBuffer, sizeof(Schema), (const gpu::Byte*) &schema, sizeof(Schema)));
}
}
_isMToon = isMToon;

6
libraries/render-utils/src/GeometryCache.cpp
View file

@ -1470,9 +1470,9 @@ void GeometryCache::renderLine(gpu::Batch& batch, const glm::vec3& p1, const glm
details.vertices = vertices;
details.vertexSize = FLOATS_PER_VERTEX;
auto verticesBuffer = std::make_shared<gpu::Buffer>();
auto normalBuffer = std::make_shared<gpu::Buffer>();
auto colorBuffer = std::make_shared<gpu::Buffer>();
auto verticesBuffer = std::make_shared<gpu::Buffer>(gpu::Buffer::VertexBuffer);
auto normalBuffer = std::make_shared<gpu::Buffer>(gpu::Buffer::VertexBuffer);
auto colorBuffer = std::make_shared<gpu::Buffer>(gpu::Buffer::VertexBuffer);
auto streamFormat = std::make_shared<gpu::Stream::Format>();
auto stream = std::make_shared<gpu::BufferStream>();

2
libraries/render-utils/src/RenderPipelines.cpp
View file

@ -1310,7 +1310,7 @@ bool RenderPipelines::bindMaterials(graphics::MultiMaterial& multiMaterial, gpu:
// MaterialEmissiveLightmap has to be set later
graphics::MultiMaterial::MToonSchema toonSchema;
defaultMToonMaterialSchema = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(toonSchema), (const gpu::Byte*) &toonSchema, sizeof(toonSchema)));
defaultMToonMaterialSchema = gpu::BufferView(std::make_shared<gpu::Buffer>(gpu::Buffer::UniformBuffer, sizeof(toonSchema), (const gpu::Byte*) &toonSchema, sizeof(toonSchema)));
defaultMToonMaterialTextures->setTexture(gr::Texture::MaterialAlbedo, textureCache->getWhiteTexture());
defaultMToonMaterialTextures->setTexture(gr::Texture::MaterialNormal, textureCache->getBlueTexture());