lib/mnit: expand images to the nearest power of 2 for OpenGL ES 1.0

[nit.git] / lib / mnit_linux / linux_opengles1.nit

diff --git a/lib/mnit_linux/linux_opengles1.nit b/lib/mnit_linux/linux_opengles1.nit
index 00a037f..084abcc 100644 (file)
--- a/lib/mnit_linux/linux_opengles1.nit
+++ b/lib/mnit_linux/linux_opengles1.nit
@@ -14,14 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module linux_opengles1 is
-       pkgconfig("glesv1_cm", "x11", "egl")
-       c_compiler_option(exec("sdl-config", "--cflags"))
-       c_linker_option(exec("sdl-config", "--libs"), "-lSDL_image -lSDL_ttf")
-end
+module linux_opengles1 is pkgconfig("x11")
 
-import mnit # for
-# import opengles1
+import mnit::opengles1
 
 import sdl
 
@@ -81,9 +76,11 @@ redef class Opengles1Display
        end
 end
 
-redef extern Opengles1Image
+redef extern class Opengles1Image
        new from_sdl_image( sdl_image: SDLImage ) is extern `{
-               return mnit_opengles_load_image( sdl_image->pixels, sdl_image->w, sdl_image->h, sdl_image->format->Amask );
+               return mnit_opengles_load_image( sdl_image->pixels,
+                       sdl_image->w, sdl_image->h,
+                       sdl_image->w, sdl_image->h, sdl_image->format->Amask );
        `}
 
        # using sdl
@@ -96,7 +93,9 @@ redef extern Opengles1Image
                        fprintf(stderr, "SDL failed to load image <%s>: %s\n", String_to_cstring(path), IMG_GetError());
                        return NULL;
                } else {
-                       opengles_image = mnit_opengles_load_image( sdl_image->pixels, sdl_image->w, sdl_image->h, sdl_image->format->Amask );
+                       opengles_image = mnit_opengles_load_image( sdl_image->pixels,
+                               sdl_image->w, sdl_image->h,
+                               sdl_image->w, sdl_image->h, sdl_image->format->Amask );
                        SDL_FreeSurface(sdl_image);
                        return opengles_image;
                }