Преглед изворни кода

Fixing invalid initialization on core thread for some buffer types

BearishSun пре 9 година
родитељ
комит
36d1b510ad

+ 1 - 4
Source/BansheeCore/Source/BsGpuBuffer.cpp

@@ -92,11 +92,8 @@ namespace BansheeEngine
 	SPtr<GpuBufferCore> GpuBufferCore::create(UINT32 elementCount, UINT32 elementSize, GpuBufferType type,
 	SPtr<GpuBufferCore> GpuBufferCore::create(UINT32 elementCount, UINT32 elementSize, GpuBufferType type,
 		GpuBufferFormat format, GpuBufferUsage usage, bool randomGpuWrite, bool useCounter)
 		GpuBufferFormat format, GpuBufferUsage usage, bool randomGpuWrite, bool useCounter)
 	{
 	{
-		SPtr<GpuBufferCore> gpuBuffer = HardwareBufferCoreManager::instance().createGpuBufferInternal(elementCount, 
+		return HardwareBufferCoreManager::instance().createGpuBuffer(elementCount, 
 			elementSize, type, format, usage, randomGpuWrite, useCounter);
 			elementSize, type, format, usage, randomGpuWrite, useCounter);
-
-		gpuBuffer->initialize();
-		return gpuBuffer;
 	}
 	}
 
 
 	GpuBuffer::GpuBuffer(UINT32 elementCount, UINT32 elementSize, GpuBufferType type, GpuBufferFormat format, 
 	GpuBuffer::GpuBuffer(UINT32 elementCount, UINT32 elementSize, GpuBufferType type, GpuBufferFormat format, 

+ 1 - 1
Source/BansheeCore/Source/BsIndexBuffer.cpp

@@ -28,7 +28,7 @@ namespace BansheeEngine
 
 
 	SPtr<IndexBufferCore> IndexBufferCore::create(IndexType itype, UINT32 numIndexes, GpuBufferUsage usage)
 	SPtr<IndexBufferCore> IndexBufferCore::create(IndexType itype, UINT32 numIndexes, GpuBufferUsage usage)
 	{
 	{
-		return HardwareBufferCoreManager::instance().createIndexBufferInternal(itype, numIndexes, usage);
+		return HardwareBufferCoreManager::instance().createIndexBuffer(itype, numIndexes, usage);
 	}
 	}
 
 
     IndexBuffer::IndexBuffer(IndexType idxType, UINT32 numIndexes, GpuBufferUsage usage) 
     IndexBuffer::IndexBuffer(IndexType idxType, UINT32 numIndexes, GpuBufferUsage usage) 

+ 1 - 1
Source/BansheeCore/Source/BsVertexBuffer.cpp

@@ -19,7 +19,7 @@ namespace BansheeEngine
 
 
 	SPtr<VertexBufferCore> VertexBufferCore::create(UINT32 vertexSize, UINT32 numVerts, GpuBufferUsage usage, bool streamOut)
 	SPtr<VertexBufferCore> VertexBufferCore::create(UINT32 vertexSize, UINT32 numVerts, GpuBufferUsage usage, bool streamOut)
 	{
 	{
-		return HardwareBufferCoreManager::instance().createVertexBufferInternal(vertexSize, numVerts, usage, streamOut);
+		return HardwareBufferCoreManager::instance().createVertexBuffer(vertexSize, numVerts, usage, streamOut);
 	}
 	}
 
 
 	VertexBuffer::VertexBuffer(UINT32 vertexSize, UINT32 numVertices, GpuBufferUsage usage, bool streamOut)
 	VertexBuffer::VertexBuffer(UINT32 vertexSize, UINT32 numVertices, GpuBufferUsage usage, bool streamOut)