nitlanguage / nit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'dump_rta'
[nit.git] / lib / mnit / opengles1.nit
diff --git a/lib/mnit/opengles1.nit b/lib/mnit/opengles1.nit
index 13ff836..347613f 100644 (file)
--- a/lib/mnit/opengles1.nit
+++ b/lib/mnit/opengles1.nit
@@ -26,13 +26,6 @@ in "C header" `{
        #include <GLES/glext.h>
        #include <errno.h>
 
-       #define LOGW(...) ((void)fprintf(stderr, "# warn: %s", __VA_ARGS__))
-       #ifdef DEBUG
-               #define LOGI(...) ((void)fprintf(stderr, "# info: %s", __VA_ARGS__))
-       #else
-               #define LOGI(...) (void)0
-       #endif
-
        EGLDisplay mnit_display;
        EGLSurface mnit_surface;
        EGLContext mnit_context;
@@ -70,16 +63,21 @@ in "C header" `{
 `}
 
 in "C" `{
+       #define LOGW(...) ((void)fprintf(stderr, "# warn: %s (%i)\n", __VA_ARGS__))
+       #ifdef DEBUG
+               #define LOGI(...) ((void)fprintf(stderr, "# info: %s (%i)\n", __VA_ARGS__))
+       #else
+               #define LOGI(...) (void)0
+       #endif
+
        extern NativeWindowType mnit_window;
        extern EGLNativeDisplayType mnit_native_display;
 
        GLfloat mnit_opengles_vertices[6][3] =
        {
-               {0.0f, 0.0f, 0.0f},
                {0.0f, 1.0f, 0.0f},
                {1.0f, 1.0f, 0.0f},
                {0.0f, 0.0f, 0.0f},
-               {1.0f, 1.0f, 0.0f},
                {1.0f, 0.0f, 0.0f},
        };
        GLfloat mnit_opengles_texture[6][2] =
@@ -109,35 +107,33 @@ in "C" `{
                image->src_xi = 1.0;
                image->src_yi = 1.0;
 
-
                if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
-                       LOGW ("a error loading image: %i\n", mnit_opengles_error_code);
-                       printf( "%i\n", mnit_opengles_error_code );
+                       LOGW("error loading image after malloc", mnit_opengles_error_code);
                }
+
                glGenTextures(1, &image->texture);
 
                if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
-                       LOGW ("b error loading image: %i\n", mnit_opengles_error_code);
-                       printf( "%i\n", mnit_opengles_error_code );
+                       LOGW("error loading image after glGenTextures", mnit_opengles_error_code);
                }
+
                glBindTexture(GL_TEXTURE_2D, image->texture);
 
                if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
-                       LOGW ("c error loading image: %i\n", mnit_opengles_error_code);
-                       printf( "%i\n", mnit_opengles_error_code );
+                       LOGW("error loading image glBindTexture", mnit_opengles_error_code);
                }
+
                glTexImage2D(   GL_TEXTURE_2D, 0, format, width, height,
                                                0, format, GL_UNSIGNED_BYTE, (GLvoid*)pixels);
 
                if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
-                       LOGW ("d error loading image: %i\n", mnit_opengles_error_code);
-                       printf( "%i\n", mnit_opengles_error_code );
+                       LOGW("error loading image after glTexImage2D", mnit_opengles_error_code);
                }
+
                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
                if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
-                       LOGW ("e error loading image: %i\n", mnit_opengles_error_code);
-                       printf( "%i\n", mnit_opengles_error_code );
+                       LOGW("error loading image after gtTexParameter", mnit_opengles_error_code);
                }
 
                return image;
@@ -170,27 +166,27 @@ class Opengles1Display
 
                EGLDisplay display = eglGetDisplay(mnit_native_display);
                if ( display == EGL_NO_DISPLAY) {
-                       LOGW("Unable to eglGetDisplay");
+                       LOGW("Unable to eglGetDisplay", 0);
                        return -1;
                }
 
                if ( eglInitialize(display, 0, 0) == EGL_FALSE) {
-                       LOGW("Unable to eglInitialize");
+                       LOGW("Unable to eglInitialize", 0);
                        return -1;
                }
 
                if ( eglChooseConfig(display, attribs, &config, 1, &numConfigs) == EGL_FALSE) {
-                       LOGW("Unable to eglChooseConfig");
+                       LOGW("Unable to eglChooseConfig", 0);
                        return -1;
                }
 
                if ( numConfigs == 0 ) {
-                       LOGW("No configs available for egl");
+                       LOGW("No configs available for egl", 0);
                        return -1;
                }
 
                if ( eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &format) == EGL_FALSE) {
-                       LOGW("Unable to eglGetConfigAttrib");
+                       LOGW("Unable to eglGetConfigAttrib", 0);
                        return -1;
                }
 
@@ -201,7 +197,7 @@ class Opengles1Display
                context = eglCreateContext(display, config, NULL, NULL);
 
                if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE) {
-                       LOGW("Unable to eglMakeCurrent");
+                       LOGW("Unable to eglMakeCurrent", 0);
                        return -1;
                }
 
@@ -216,7 +212,10 @@ class Opengles1Display
                mnit_height = h;
                mnit_zoom = 1.0f;
 
-               LOGI( "surface: %i, display: %i, w %i, h %i", (int)surface, (int)display, w, h );
+               LOGI("surface", (int)surface);
+               LOGI("display", (int)display);
+               LOGI("width", w);
+               LOGI("height", h);
 
                glViewport(0, 0, mnit_width, mnit_height);
                glMatrixMode(GL_PROJECTION);
@@ -277,13 +276,11 @@ class Opengles1Display
        `}
 
        redef fun blit( image, x, y ) is extern  `{
-               GLfloat texture_coord[6][2] =
+               GLfloat texture_coord[4][2] =
                {
-                       {image->src_xo, image->src_yo},
                        {image->src_xo, image->src_yi},
                        {image->src_xi, image->src_yi},
                        {image->src_xo, image->src_yo},
-                       {image->src_xi, image->src_yi},
                        {image->src_xi, image->src_yo}
                };
 
@@ -305,9 +302,9 @@ class Opengles1Display
                glDisable(GL_DEPTH_TEST);
 
                glVertexPointer(3, GL_FLOAT, 0, mnit_opengles_vertices);
-               glTexCoordPointer(2, GL_FLOAT, 0, texture_coord ); /* mnit_opengles_texture); */
+               glTexCoordPointer(2, GL_FLOAT, 0, texture_coord );
 
-               glDrawArrays(GL_TRIANGLE_STRIP, 0, 6);
+               glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
                glDisableClientState(GL_VERTEX_ARRAY);
                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -315,7 +312,7 @@ class Opengles1Display
                glDisable(GL_TEXTURE_2D);
 
                if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
-                  LOGW ("error drawing: %i", mnit_opengles_error_code);
+                  LOGW("error drawing", mnit_opengles_error_code);
                }
        `}
 
@@ -327,13 +324,11 @@ class Opengles1Display
     end
 
        redef fun blit_rotated( image, x, y, angle ) is extern  `{
-               GLfloat texture_coord[6][2] =
+               GLfloat texture_coord[4][2] =
                {
-                       {image->src_xo, image->src_yo},
                        {image->src_xo, image->src_yi},
                        {image->src_xi, image->src_yi},
                        {image->src_xo, image->src_yo},
-                       {image->src_xi, image->src_yi},
                        {image->src_xi, image->src_yo}
                };
 
@@ -357,7 +352,7 @@ class Opengles1Display
                glVertexPointer(3, GL_FLOAT, 0, mnit_opengles_vertices);
                glTexCoordPointer(2, GL_FLOAT, 0, texture_coord );
 
-               glDrawArrays(GL_TRIANGLE_STRIP, 0, 6);
+               glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
                glDisableClientState(GL_VERTEX_ARRAY);
                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -365,7 +360,7 @@ class Opengles1Display
                glDisable(GL_TEXTURE_2D);
 
                if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
-                  LOGW ("error drawing: %i", mnit_opengles_error_code);
+                  LOGW("error drawing", mnit_opengles_error_code);
                }
        `}
 
@@ -405,7 +400,7 @@ class Opengles1Display
                glVertexPointer(3, GL_FLOAT, 0, mnit_opengles_vertices_stretched);
                glTexCoordPointer(2, GL_FLOAT, 0, texture_coord );
 
-               glDrawArrays(GL_TRIANGLE_STRIP, 0, 6);
+               glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
                glDisableClientState(GL_VERTEX_ARRAY);
                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -413,7 +408,7 @@ class Opengles1Display
                glDisable(GL_TEXTURE_2D);
 
                if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
-                  LOGW ("error drawing: %i", mnit_opengles_error_code);
+                  LOGW("error drawing", mnit_opengles_error_code);
                }
        `}
 
@@ -464,8 +459,8 @@ extern Opengles1Image in "C" `{struct mnit_opengles_Texture *`}
 
                image->src_xo = ((float)x)/recv->width;
                image->src_yo = ((float)y)/recv->height;
-               image->src_xi = ((float)w+w)/recv->width;
-               image->src_yi = ((float)x+h)/recv->height;
+               image->src_xi = ((float)x+w)/recv->width;
+               image->src_yi = ((float)y+h)/recv->height;
 
                return Opengles1Image_as_Image( image );
     `}
@@ -517,15 +512,8 @@ extern Opengles1DrawableImage in "C" `{struct mnit_opengles_DrawableTexture*`}
 
                if ( glCheckFramebufferStatusOES( GL_FRAMEBUFFER_OES ) != GL_FRAMEBUFFER_COMPLETE_OES )
                {
-                       LOGW( "framebuffer not set" );
-                       if ( glCheckFramebufferStatusOES( GL_FRAMEBUFFER_OES ) == GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES )
-                               LOGW( "framebuffer not set a" );
-                       else if ( glCheckFramebufferStatusOES( GL_FRAMEBUFFER_OES ) == GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES )
-                               LOGW( "framebuffer not set b" );
-                       else if ( glCheckFramebufferStatusOES( GL_FRAMEBUFFER_OES ) == GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES )
-                               LOGW( "framebuffer not set c" );
-                       else if ( glCheckFramebufferStatusOES( GL_FRAMEBUFFER_OES ) == GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES )
-                               LOGW( "framebuffer not set d" );
+                       LOGW("framebuffer not set", glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
+                       exit(1);
                }
 
                image->super.width = w;
@@ -535,7 +523,10 @@ extern Opengles1DrawableImage in "C" `{struct mnit_opengles_DrawableTexture*`}
                image->super.scale = 1.0f;
                image->super.blended = 0;
 
-               if (glGetError() != GL_NO_ERROR) LOGW( "gl error");
+               if ((mnit_opengles_error_code = glGetError()) != GL_NO_ERROR) {
+                  LOGW("gl error in Opengles1DrawableImage::init", mnit_opengles_error_code);
+                  exit(1);
+               }
 
                return image;
        `}
@@ -543,7 +534,7 @@ extern Opengles1DrawableImage in "C" `{struct mnit_opengles_DrawableTexture*`}
     fun set_as_target is extern `{
                LOGI( "sat %i", recv->fbo );
                glBindFramebufferOES(GL_FRAMEBUFFER_OES, recv->fbo);
-               if (glGetError() != GL_NO_ERROR) LOGW( "gl error 0");
+               if (glGetError() != GL_NO_ERROR) LOGW("gl error", 0);
                /*glGetIntegerv(GL_FRAMEBUFFER_BINDING_OES,&recv->fbo);
                if (glGetError() != GL_NO_ERROR) LOGW( "gl error a");*/
                glViewport(0, 0, recv->super.width, recv->super.height);
@@ -564,7 +555,7 @@ extern Opengles1DrawableImage in "C" `{struct mnit_opengles_DrawableTexture*`}
                glGenerateMipmapOES(GL_TEXTURE_2D);
                glBindTexture(GL_TEXTURE_2D, 0);*/
                glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-               if (glGetError() != GL_NO_ERROR) LOGW( "gl error");
+               if (glGetError() != GL_NO_ERROR) LOGW("gl error", 0);
        `}
 end
 
Nit language project; an oo programing language and its tool suite.