Browse Source

Inc limits

Panagiotis Christopoulos Charitos 10 years ago
parent
commit
f7335f9c17

+ 1 - 1
include/anki/gr/gl/GlState.h

@@ -72,7 +72,7 @@ public:
 
 
 	/// Global UBO ring buffer
 	/// Global UBO ring buffer
 	/// @{
 	/// @{
-	U32 m_globalUboSize = MAX_UBO_SIZE * 256; ///< 16MB
+	U32 m_globalUboSize = MAX_UBO_SIZE * 512; ///< 32MB
 	DArray<GLuint> m_globalUbos; ///< Multiple cause of the spec's UBO max size.
 	DArray<GLuint> m_globalUbos; ///< Multiple cause of the spec's UBO max size.
 	DArray<U8*> m_globalUboAddresses;
 	DArray<U8*> m_globalUboAddresses;
 	Atomic<U32> m_globalUboCurrentOffset = {0};
 	Atomic<U32> m_globalUboCurrentOffset = {0};

+ 1 - 1
include/anki/gr/gl/RenderingThread.h

@@ -69,7 +69,7 @@ private:
 	WeakPtr<GrManager> m_manager;
 	WeakPtr<GrManager> m_manager;
 	WeakPtr<GrManagerInterface> m_interface;
 	WeakPtr<GrManagerInterface> m_interface;
 
 
-	static const U QUEUE_SIZE = 512;
+	static const U QUEUE_SIZE = 1024;
 	DArray<CommandBufferPtr> m_queue; ///< Command queue
 	DArray<CommandBufferPtr> m_queue; ///< Command queue
 	U64 m_tail; ///< Tail of queue
 	U64 m_tail; ///< Tail of queue
 	U64 m_head; ///< Head of queue. Points to the end
 	U64 m_head; ///< Head of queue. Points to the end

+ 2 - 0
testapp/Main.cpp

@@ -506,6 +506,8 @@ Error initSubsystems(int argc, char* argv[])
 	config.set("debugContext", false);
 	config.set("debugContext", false);
 	config.set("dataPaths", "assets");
 	config.set("dataPaths", "assets");
 	config.set("sceneFrameAllocatorSize", 1024 * 1024 * 10);
 	config.set("sceneFrameAllocatorSize", 1024 * 1024 * 10);
+	config.set("maxTextureSize", 256);
+	config.set("lodDistance", 3.0);
 
 
 	app = new App;
 	app = new App;
 	err = app->create(config, allocAligned, nullptr);
 	err = app->create(config, allocAligned, nullptr);

+ 1 - 1
tools/scene/Exporter.cpp

@@ -990,7 +990,7 @@ void Exporter::visitNode(const aiNode* ainode)
 		bool special = false;
 		bool special = false;
 		for(const auto& prop : m_scene->mMeshes[meshIndex]->mProperties)
 		for(const auto& prop : m_scene->mMeshes[meshIndex]->mProperties)
 		{
 		{
-			if(prop.first == "particles_file")
+			if(prop.first == "particles")
 			{
 			{
 				ParticleEmitter p;
 				ParticleEmitter p;
 				p.m_filename = prop.second;
 				p.m_filename = prop.second;