Add gpu program params storage structure

code/nel/include/nel/3d/gpu_program_params.h

@@ -0,0 +1,100 @@
+/**
+ * \file gpu_program_params.h
+ * \brief CGPUProgramParams
+ * \date 2013-09-07 22:17GMT
+ * \author Jan Boon (Kaetemi)
+ * CGPUProgramParams
+ */
+
+/* 
+ * Copyright (C) 2013  by authors
+ * 
+ * This file is part of NL3D.
+ * NL3D is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * NL3D is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General
+ * Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with NL3D.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NL3D_GPU_PROGRAM_PARAMS_H
+#define NL3D_GPU_PROGRAM_PARAMS_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+#include <map>
+#include <vector>
+
+// NeL includes
+
+// Project includes
+
+namespace NL3D {
+
+/**
+ * \brief CGPUProgramParams
+ * \date 2013-09-07 22:17GMT
+ * \author Jan Boon (Kaetemi)
+ * A storage for user-provided parameters for GPU programs.
+ * Allows for fast updating and iteration of parameters.
+ * NOTE TO DRIVER IMPLEMENTORS: DO NOT USE FOR STORING COPIES 
+ * OF HARDCODED MATERIAL PARAMETERS OR DRIVER PARAMETERS!!!
+ */
+class CGPUProgramParams
+{
+public:
+	enum TType { Float, Int };
+	struct CMeta { uint Index, Count; TType Type; size_t Next, Prev; };
+
+private:
+	union CVec { float F[4]; sint32 I[4]; };
+
+public:
+	CGPUProgramParams();
+	virtual ~CGPUProgramParams();
+
+	void set(uint index, float f0, float f1, float f2, float f3);
+	void set(uint index, int i0, int i1, int i2, int i3);
+
+	// Internal
+	/// Allocate specified number of components if necessary
+	size_t allocOffset(uint index, uint count, TType type);
+	/// Return offset for specified index
+	size_t getOffset(uint index) const;
+	/// Remove by offset
+	void freeOffset(size_t offset);
+
+	// Iteration
+	size_t getBegin() const { return m_Meta.size() ? m_First : s_End; }
+	size_t getNext(size_t offset) const { return m_Meta[offset].Next; }
+	size_t getEnd() const { return s_End; }
+
+	// Data access
+	uint getCountByOffset(size_t offset) { return m_Meta[offset].Count; }
+	float *getPtrFByOffset(size_t offset) { return m_Vec[offset].F; }
+	int *getPtrIByOffset(size_t offset) { return m_Vec[offset].I; }
+	TType getTypeByOffset(size_t offset) { return m_Meta[offset].Type; }
+
+private:
+	std::vector<CVec> m_Vec;
+	std::vector<CMeta> m_Meta;
+	std::vector<size_t> m_Map; // map from index to buffer index
+	size_t m_First;
+	size_t m_Last;
+	static const size_t s_End = -1;
+
+}; /* class CGPUProgramParams */
+
+} /* namespace NL3D */
+
+#endif /* #ifndef NL3D_GPU_PROGRAM_PARAMS_H */
+
+/* end of file */

code/nel/src/3d/CMakeLists.txt

@@ -170,7 +170,9 @@ SOURCE_GROUP(Driver FILES
         gpu_program.cpp
         ../../include/nel/3d/gpu_program.h
         gpu_program_source.cpp
-        ../../include/nel/3d/gpu_program_source.h)
+        ../../include/nel/3d/gpu_program_source.h
+        gpu_program_params.cpp
+        ../../include/nel/3d/gpu_program_params.h)
 
 SOURCE_GROUP(Font FILES
         computed_string.cpp

code/nel/src/3d/gpu_program_params.cpp

@@ -0,0 +1,165 @@
+/**
+ * \file gpu_program_params.cpp
+ * \brief CGPUProgramParams
+ * \date 2013-09-07 22:17GMT
+ * \author Jan Boon (Kaetemi)
+ * CGPUProgramParams
+ */
+
+/* 
+ * Copyright (C) 2013  by authors
+ * 
+ * This file is part of NL3D.
+ * NL3D is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * NL3D is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General
+ * Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with NL3D.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <nel/misc/types_nl.h>
+#include <nel/3d/gpu_program_params.h>
+
+// STL includes
+
+// NeL includes
+// #include <nel/misc/debug.h>
+
+// Project includes
+
+using namespace std;
+// using namespace NLMISC;
+
+namespace NL3D {
+
+CGPUProgramParams::CGPUProgramParams() : m_First(s_End), m_Last(s_End)
+{
+	
+}
+
+CGPUProgramParams::~CGPUProgramParams()
+{
+	
+}
+
+void CGPUProgramParams::set(uint index, float f0, float f1, float f2, float f3)
+{
+	float *f = getPtrFByOffset(allocOffset(index, 4, Float));
+	f[0] = f0;
+	f[1] = f1;
+	f[2] = f2;
+	f[3] = f3;
+}
+
+void CGPUProgramParams::set(uint index, int i0, int i1, int i2, int i3)
+{
+	int *i = getPtrIByOffset(allocOffset(index, 4, Int));
+	i[0] = i0;
+	i[1] = i1;
+	i[2] = i2;
+	i[3] = i3;
+}
+
+/// Allocate specified number of components if necessary
+size_t CGPUProgramParams::allocOffset(uint index, uint count, TType type)
+{
+	nlassert(count > 0); // this code will not properly handle 0
+	nlassert(index < 0xFFFF); // sanity check
+
+	size_t offset = getOffset(index);
+	if (offset != s_End)
+	{
+		if (getCountByOffset(offset) == count)
+		{
+			m_Meta[offset].Type = type;
+			return offset;
+		}
+		if (getCountByOffset(offset) > count)
+		{
+			m_Meta[offset].Type = type;
+			m_Meta[offset].Count = count; // reduce count
+			return offset;
+		}
+		if (getCountByOffset(offset) < count)
+		{
+			freeOffset(offset);
+		}
+	}
+
+	// Allocate space
+	offset = m_Meta.size();
+	uint blocks = (count + 3) >> 2; // per 4 components
+	m_Meta.resize(offset + blocks);
+	m_Vec.resize(offset + blocks);
+
+	// Store offset in map
+	if (index >= m_Map.size())
+		m_Map.resize(index + 1, s_End);
+	m_Map[index] = offset;
+
+	// Fill
+	m_Meta[offset].Index = index;
+	m_Meta[offset].Count = count;
+	m_Meta[offset].Type = type;
+	m_Meta[offset].Prev = m_Last;
+	m_Meta[offset].Next = s_End;
+
+	// Link
+	if (m_Last == s_End)
+	{
+		m_First = m_Last = offset;
+	}
+	else
+	{
+		nlassert(m_Meta[m_Last].Next == s_End); // code error otherwise
+		m_Meta[m_Last].Next = offset;
+		m_Last = offset;
+	}
+
+	return offset;
+}
+
+/// Return offset for specified index
+size_t CGPUProgramParams::getOffset(uint index) const
+{
+	if (index >= m_Map.size())
+		return s_End;
+	return m_Map[index];
+}
+
+/// Remove by offset
+void CGPUProgramParams::freeOffset(size_t offset)
+{
+	if (offset == m_Last)
+	{
+		nlassert(m_Meta[offset].Next == s_End);
+		m_Last = m_Meta[offset].Prev;
+	}
+	else
+	{
+		nlassert(m_Meta[offset].Next != s_End);		
+		m_Meta[m_Meta[offset].Next].Prev = m_Meta[offset].Prev;
+	}
+	if (offset == m_First)
+	{
+		nlassert(m_Meta[offset].Prev == s_End);
+		m_First = m_Meta[offset].Next;
+	}
+	else
+	{
+		nlassert(m_Meta[offset].Prev != s_End);
+		m_Meta[m_Meta[offset].Prev].Next = m_Meta[offset].Next;
+	}
+}
+
+} /* namespace NL3D */
+
+/* end of file */