Add some functions to nanogl.h interface

diff --git a/GL/nanogl.h b/GL/nanogl.h
index ff7ca61bf3277ef250cbe407443b3425b679a9d1..99102fa01187f14159b4f414338f083c6c54a0c0 100644 (file)
--- a/GL/nanogl.h
+++ b/GL/nanogl.h
@@ -27,7 +27,9 @@ extern "C" {
 
 int nanoGL_Init(void);
 void nanoGL_Destroy(void);
-
+void nanoGL_Flush();
+void *nanoGL_GetProcAddress(const char *);
+void nanoGL_Reset();
 #ifdef __cplusplus
 }
 #endif

diff --git a/nanoWrap.cpp b/nanoWrap.cpp
index 27daf14cd5a1c048a61cdf4b50390fbc2c6e7286..a30a009de2421771b32292914fa1ae480c96ed7a 100644 (file)
--- a/nanoWrap.cpp
+++ b/nanoWrap.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "gl.h"
 #include "glesinterface.h"
+#include "nanogl.h"
 
 #define GL_TEXTURE0_ARB                     0x84C0
 #define GL_TEXTURE1_ARB                     0x84C1
@@ -360,7 +361,14 @@ void FlushOnStateChange()
     ptrIndexArray = indexArray;
     useTexCoordArray = GL_FALSE;
     }
-
+void nanoGL_Flush()
+       {
+       FlushOnStateChange();
+       }
+void nanoGL_Reset()
+{
+       ResetNanoState();
+}
 void glBegin(GLenum mode)
     {
     wrapperPrimitiveMode = mode;
@@ -1412,7 +1420,7 @@ void glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 
 GLenum glGetError (void)
     {
-    FlushOnStateChange();
+    //FlushOnStateChange();
     return GL_NO_ERROR;//glEsImpl->glGetError();
     }
 

diff --git a/nanogl.cpp b/nanogl.cpp
index c16a7a0f1f103acee3b39442752cfce2636f3999..5add36a367bda8220013657d37844bc3bfb0f861 100644 (file)
--- a/nanogl.cpp
+++ b/nanogl.cpp
@@ -70,6 +70,10 @@ static void gl_unimplemented() {
        LOGE ("Called unimplemented OpenGL ES API\n"); 
 }
 
+void *nanoGL_GetProcAddress(const char *name)
+{
+       return dlsym(glesLib, name);
+}
 
 static int CreateGlEsInterface( const char * name, void * lib, void * lib1, void * default_func )
 {
@@ -92,7 +96,7 @@ static int CreateGlEsInterface( const char * name, void * lib, void * lib1, void
        {
                void * f;
                
-               f = dlsym(lib, *api); // ltry ibGLESxx_CM.so
+               f = dlsym(lib, *api); // try libGLESxx_CM.so
 
                if (f == NULL) {
                        LOGW( "<%s> not found in %s. Trying libEGL.so.", *api, name); //driver);