Merge branch '0.2.0' of ssh://g-truc.git.sourceforge.net/gitroot/kuek…

…en/kueken into 0.2.0
Groovounet · Oct 28, 2010 · 6ac0224 · 6ac0224
2 parents 621f0b5 + 527ee8b
commit 6ac0224
Show file tree

Hide file tree

Showing 10 changed files with 488 additions and 13 deletions.
diff --git a/include/core/renderbuffer.hpp b/include/core/renderbuffer.hpp
@@ -11,6 +11,11 @@ namespace kueken
 namespace kueken{
 namespace renderbuffer
 {
+	struct info
+	{
+		// GL_MAX_RENDERBUFFER_SIZE // ???
+	};
+
 	enum format
 	{
 		DEPTH24,

diff --git a/include/core/renderer.hpp b/include/core/renderer.hpp
@@ -115,6 +115,15 @@ namespace kueken
 		texture::object & map(texture::name const & Name);
 		void unmap(texture::name const & Name);
 
+		template <typename OBJECT>
+		void info() const{assert(0);}
+
+		template <>
+		texture::info info<texture::object>() const
+		{
+			return texture::info();
+		}
+
 		//query::name create(query::creator const & Creator);
 		//void free(query::name& Name);
 		//void begin(query::name const & Name);

diff --git a/include/core/texture.hpp b/include/core/texture.hpp
@@ -281,6 +281,15 @@ namespace detail
 	typedef std::size_t slot;
 	typedef std::size_t level;
 
+	struct info
+	{
+		//GL_MAX_RECTANGLE_TEXTURE_SIZE // 1024
+		//GL_MAX_TEXTURE_IMAGE_UNITS // 16
+		//GL_MAX_TEXTURE_BUFFER_SIZE // 65536
+		//GL_MAX_TEXTURE_LOD_BIAS // 2.0
+		//GL_MAX_TEXTURE_SIZE // 1024
+	};
+
 	enum type
 	{
 		IMAGE,

diff --git a/sample/01-core-basic.cpp b/sample/01-core-basic.cpp
@@ -152,9 +152,9 @@ bool initTexture2D()
 		}
 		Texture = Renderer->create(Creator);
 
-		kueken::texture::object & Object = Renderer->map(Texture);
-		Object.generateMipmaps();
-		Renderer->unmap(Texture);
+		//kueken::texture::object & Object = Renderer->map(Texture);
+		//Object.generateMipmaps();
+		//Renderer->unmap(Texture);
 	}
 
 	{