Browse Source

Remove obsolete code and hopefully fix VS2013 build

--HG--
branch : minor
Alex Szpakowski 8 years ago
parent
commit
61a8ce6a66
2 changed files with 1 additions and 102 deletions
  1. 0 61
      src/modules/graphics/opengl/FenceSync.cpp
  2. 1 41
      src/modules/graphics/opengl/FenceSync.h

+ 0 - 61
src/modules/graphics/opengl/FenceSync.cpp

@@ -81,67 +81,6 @@ void FenceSync::cleanup()
 	}
 	}
 }
 }
 
 
-BufferSync::~BufferSync()
-{
-	cleanup();
-}
-
-void BufferSync::lock(size_t start, size_t length)
-{
-	Range range = {start, length};
-	GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-	locks.emplace_back(range, sync);
-}
-
-void BufferSync::wait(size_t start, size_t length)
-{
-	Range range = {start, length};
-	int lockcount = (int) locks.size();
-
-	for (int i = 0; i < lockcount; i++)
-	{
-		if (range.overlaps(locks[i].range))
-		{
-			syncWait(locks[i].sync);
-			glDeleteSync(locks[i].sync);
-
-			locks[i] = locks[lockcount - 1];
-			locks.pop_back();
-
-			--lockcount;
-			--i;
-		}
-	}
-}
-
-void BufferSync::cleanup()
-{
-	for (const auto &lock : locks)
-		glDeleteSync(lock.sync);
-
-	locks.clear();
-}
-
-void BufferSync::syncWait(GLsync sync)
-{
-	GLbitfield flags = 0;
-	GLuint64 duration = 0;
-
-	while (true)
-	{
-		GLenum status = glClientWaitSync(sync, flags, duration);
-
-		if (status == GL_ALREADY_SIGNALED || status == GL_CONDITION_SATISFIED)
-			return;
-
-		if (status == GL_WAIT_FAILED)
-			return;
-
-		flags = GL_SYNC_FLUSH_COMMANDS_BIT;
-		duration = 1000000000; // 1 second in nanoseconds.
-	}
-}
-
 } // opengl
 } // opengl
 } // graphics
 } // graphics
 } // love
 } // love

+ 1 - 41
src/modules/graphics/opengl/FenceSync.h

@@ -38,6 +38,7 @@ class FenceSync
 {
 {
 public:
 public:
 
 
+	FenceSync() {}
 	~FenceSync();
 	~FenceSync();
 
 
 	bool fence();
 	bool fence();
@@ -50,47 +51,6 @@ private:
 
 
 }; // FenceSync
 }; // FenceSync
 
 
-class BufferSync
-{
-public:
-
-	~BufferSync();
-
-	void lock(size_t start, size_t length);
-	void wait(size_t start, size_t length);
-	void cleanup();
-
-private:
-
-	struct Range
-	{
-		size_t offset;
-		size_t length;
-
-		bool overlaps(const Range &other) const
-		{
-			return offset < (other.offset + other.length)
-				&& other.offset < (offset + length);
-		}
-	};
-
-	struct Lock
-	{
-		Range range;
-		GLsync sync;
-
-		Lock(const Range &range, GLsync sync)
-			: range(range)
-			, sync(sync)
-		{}
-	};
-
-	void syncWait(GLsync sync);
-
-	std::vector<Lock> locks;
-
-}; // BufferSync
-
 } // opengl
 } // opengl
 } // graphics
 } // graphics
 } // love
 } // love