From bc0d1f80eed862524237c381f850adb0e9fbde96 Mon Sep 17 00:00:00 2001
From: Laurent Carlier <lordheavy@users.sourceforge.net>
Date: Mon, 28 Dec 2009 00:06:37 +0000
Subject: [PATCH] [GB.OPENGL] * NEW: Add internal GL_COMPRESSED_TEXTURE_FORMATS
 support through Gl.Gets, also do some code cleanup.

git-svn-id: svn://localhost/gambas/trunk@2527 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 gb.opengl/src/GL.c     |  10 ----
 gb.opengl/src/GLinfo.c | 114 ++++++-----------------------------------
 2 files changed, 15 insertions(+), 109 deletions(-)

diff --git a/gb.opengl/src/GL.c b/gb.opengl/src/GL.c
index 1e1f73699..7713c1381 100644
--- a/gb.opengl/src/GL.c
+++ b/gb.opengl/src/GL.c
@@ -40,13 +40,6 @@
 
 /**************************************************************************/
 
-BEGIN_METHOD_VOID(GL_exit)
-
-	// free reserved memories
-	freeGetsAllocs();
-
-END_METHOD
-
 BEGIN_METHOD_VOID(GLCHECKERROR)
 
 	GB.ReturnInteger(glGetError());
@@ -59,9 +52,6 @@ GB_DESC Cgl[] =
 {
 	GB_DECLARE("Gl",0), GB_NOT_CREATABLE(),
 	
-//	GB_STATIC_METHOD("_init", NULL, GL_init, NULL),
-	GB_STATIC_METHOD("_exit", NULL, GL_exit, NULL),
-
 	/* Check errors */
 	GB_STATIC_METHOD("GetError", "i", GLCHECKERROR, NULL),
 
diff --git a/gb.opengl/src/GLinfo.c b/gb.opengl/src/GLinfo.c
index 0a19a5421..ab995a266 100644
--- a/gb.opengl/src/GLinfo.c
+++ b/gb.opengl/src/GLinfo.c
@@ -24,63 +24,16 @@
 
 #include "GL.h"
 
-/* Special cases (TODO):
-- GL_COMPRESSED_TEXTURE_FORMATS
-*/
-
-// max size of an array
-#define MAXSIZE 16
-
-// Arrays returned with glGet calls
-static GLboolean *boolArray;
-static int boolSize = 0;
-static GLdouble *floatArray;
-static int floatSize = 0;
-static GLint *intArray;
-static int intSize = 0;
-
-static void resizeBool(int size)
-{
-	if (size < boolSize)
-		return;
-
-	if (!boolSize)
-		GB.Alloc(POINTER(&boolArray), sizeof(GLboolean)*size);
-	else
-		GB.Realloc(POINTER(&boolArray), sizeof(GLboolean)*size);
-
-	boolSize = size;
-}
-
-static void resizeFloat(int size)
-{
-	if (size < floatSize)
-		return;
-
-	if (!floatSize)
-		GB.Alloc(POINTER(&floatArray), sizeof(GLdouble)*size);
-	else
-		GB.Realloc(POINTER(&floatArray), sizeof(GLdouble)*size);
-
-	floatSize = size;
-}
-
-static void resizeInt(int size)
-{
-	if (size < intSize)
-		return;
-
-	if (!intSize)
-		GB.Alloc(POINTER(&intArray), sizeof(GLint)*size);
-	else
-		GB.Realloc(POINTER(&intArray), sizeof(GLint)*size);
-
-	intSize = size;
-}
-
 static int checkSize(GLenum value)
 {
 	int retSize = 0;
+	
+	if (value == GL_COMPRESSED_TEXTURE_FORMATS)
+	{
+		GLint size;
+		glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &size);
+		return size;
+	}
 
 	switch(value)
 	{
@@ -454,26 +407,10 @@ static int checkSize(GLenum value)
 			retSize = 16;
 			break;
 	}
-
+	
 	return retSize;
 }
 
-void freeGetsAllocs(void )
-{
-	if (boolSize)
-		GB.Free(POINTER(&boolArray));
-
-	if (floatSize)
-		GB.Free(POINTER(&floatArray));
-
-	if (intSize)
-		GB.Free(POINTER(&intArray));
-
-	boolSize = 0;
-	floatSize = 0;
-	intSize = 0;
-}
-
 /**************************************************************************/
 
 /*
@@ -481,7 +418,6 @@ void freeGetsAllocs(void )
    If not (0 is returned), we check the size method parameter.
    If size is always 0 (size parameter is equal to 0 or is missing)
    we return a null object.
-   If size is too big (see MAXSIZE) an error is raised.
 
    Finally we return an object of the defined size.
 */
@@ -490,26 +426,20 @@ void freeGetsAllocs(void )
 BEGIN_METHOD(GLGETBOOLEANV, GB_INTEGER parameter; GB_INTEGER size)
 
 	GB_ARRAY bArray;
-	int i;
 	int size = checkSize(VARG(parameter));
 
 	if (!size)
 		size = VARGOPT(size, 0);
 
-	if (size >= MAXSIZE)
-	{
-		GB.Error("Parameter size is too big");
-		return;
-	}
-
 	if (!size)
 	{
 		GB.ReturnNull();
 		return;
 	}
 
-	resizeBool(size);
-
+	int i;
+	GLboolean boolArray[size];
+	
 	GB.Array.New(&bArray , GB_T_BOOLEAN , size);
 	glGetBooleanv(VARG(parameter), boolArray);
 	
@@ -518,32 +448,24 @@ BEGIN_METHOD(GLGETBOOLEANV, GB_INTEGER parameter; GB_INTEGER size)
 	
 	GB.ReturnObject(bArray);
 
-
-
 END_METHOD
 
 BEGIN_METHOD(GLGETFLOATV, GB_INTEGER parameter; GB_INTEGER size)
 
 	GB_ARRAY fArray;
-	int i;
 	int size = checkSize(VARG(parameter));
 
 	if (!size)
 		size = VARGOPT(size, 0);
 
-	if (size >= MAXSIZE)
-	{
-		GB.Error("Parameter size is too big");
-		return;
-	}
-
 	if (!size)
 	{
 		GB.ReturnNull();
 		return;
 	}
 
-	resizeFloat(size);
+	int i;
+	GLdouble floatArray[size];
 
 	GB.Array.New(&fArray , GB_T_FLOAT , size);
 	glGetDoublev(VARG(parameter), floatArray);
@@ -558,25 +480,19 @@ END_METHOD
 BEGIN_METHOD(GLGETINTEGERV, GB_INTEGER parameter; GB_INTEGER size)
 
 	GB_ARRAY iArray;
-	int i;
 	int size = checkSize(VARG(parameter));
 
 	if (!size)
 		size = VARGOPT(size, 0);
 
-	if (size >= MAXSIZE)
-	{
-		GB.Error("Parameter size is too big");
-		return;
-	}
-
 	if (!size)
 	{
 		GB.ReturnNull();
 		return;
 	}
 
-	resizeInt(size);
+	int i;
+	GLint intArray[size];
 
 	GB.Array.New(&iArray , GB_T_INTEGER , size);
 	glGetIntegerv(VARG(parameter), intArray);