diff --git a/legacy/evas/src/evas_gl_routines.c b/legacy/evas/src/evas_gl_routines.c
index 7ad405136a..e7f574c3dd 100644
--- a/legacy/evas/src/evas_gl_routines.c
+++ b/legacy/evas/src/evas_gl_routines.c
@@ -163,12 +163,30 @@ __evas_gl_image_copy_image_rect_to_texture(Evas_GL_Image *im, int x, int y,
      }
 #ifdef HAVE_GLU
    if (__evas_anti_alias)
-      gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA8, tw, th, GL_RGBA, 
-			GL_UNSIGNED_BYTE, data);
+     {
+	gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA8, tw, th, GL_RGBA, 
+			  GL_UNSIGNED_BYTE, data);
+	if (glGetError() == GL_OUT_OF_MEMORY)
+	  {
+	     __evas_gl_image_cache_empty(im->buffer.display);
+	     __evas_gl_text_cache_empty(im->buffer.display);
+	     gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA8, tw, th, GL_RGBA, 
+			       GL_UNSIGNED_BYTE, data);
+	  }
+     }
    else
 #endif      
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tw, th, 0,
-		   GL_RGBA, GL_UNSIGNED_BYTE, data);
+     {
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tw, th, 0,
+		     GL_RGBA, GL_UNSIGNED_BYTE, data);
+	if (glGetError() == GL_OUT_OF_MEMORY)
+	  {
+	     __evas_gl_image_cache_empty(im->buffer.display);
+	     __evas_gl_text_cache_empty(im->buffer.display);
+	     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tw, th, 0,
+			  GL_RGBA, GL_UNSIGNED_BYTE, data);
+	  }
+     }
    free(data);
 }
 
@@ -885,6 +903,9 @@ __evas_gl_text_paste(Evas_GL_Font *f, char *text,
 	if (last_tex != f->glyphinfo[j].texture)
 	  {
 	     glBindTexture(GL_TEXTURE_2D, f->glyphinfo[j].texture);
+/* if i don't have these 2 lines.. it screwes up*/
+	     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	     last_tex = f->glyphinfo[j].texture;
 	  }
 	if (ymin < 0) off = 0;
@@ -1010,6 +1031,13 @@ __evas_gl_text_font_render_textures(Evas_GL_Font *f)
 	  {
 	     glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA4, f->max_texture_size, f->max_texture_size, 0,
 			  GL_ALPHA, GL_UNSIGNED_BYTE, data);
+	     if (glGetError() == GL_OUT_OF_MEMORY)
+	       {
+		  __evas_gl_image_cache_empty(f->buffer.display);
+		  __evas_gl_text_cache_empty(f->buffer.display);
+		  glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA4, f->max_texture_size, f->max_texture_size, 0,
+			       GL_ALPHA, GL_UNSIGNED_BYTE, data);
+	       }
 	     j++;
 	     if (j >= f->num_textures)
 		didlast = 1;
@@ -1039,6 +1067,13 @@ __evas_gl_text_font_render_textures(Evas_GL_Font *f)
      {
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA4, f->max_texture_size, f->max_texture_size, 0,
 		     GL_ALPHA, GL_UNSIGNED_BYTE, data);
+	if (glGetError() == GL_OUT_OF_MEMORY)
+	  {
+	     __evas_gl_image_cache_empty(f->buffer.display);
+	     __evas_gl_text_cache_empty(f->buffer.display);
+	     glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA4, f->max_texture_size, f->max_texture_size, 0,
+			  GL_ALPHA, GL_UNSIGNED_BYTE, data);
+	  }
      }
    if (data)
      {
@@ -2030,6 +2065,13 @@ __evas_gl_gradient_gen_texture(Evas_GL_Graident *gr)
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, gr->max_texture_size, 1, 0,
 		GL_RGBA, GL_UNSIGNED_BYTE, map);
+   if (glGetError() == GL_OUT_OF_MEMORY)
+     {
+	__evas_gl_image_cache_empty(gr->buffer.display);
+	__evas_gl_text_cache_empty(gr->buffer.display);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, gr->max_texture_size, 1, 0,
+		     GL_RGBA, GL_UNSIGNED_BYTE, map);
+     }
    gr->texture_w = ll;
    gr->texture_h = 1;
    free(pmap);
diff --git a/legacy/evas/test/evas_test.c b/legacy/evas/test/evas_test.c
index 2915f5d864..190c6d81d0 100644
--- a/legacy/evas/test/evas_test.c
+++ b/legacy/evas/test/evas_test.c
@@ -40,6 +40,26 @@ void   mouse_move    (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int
 void   mouse_in      (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
 void   mouse_out     (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
 
+typedef struct _textblock TextBlock;
+
+struct _textblock
+{
+   double time1, time2, time3, time4;
+   char *text;
+   Evas_Object o_text, o_shadow;
+};
+
+static double texts_loop = 60;
+static TextBlock texts[] =
+{
+     { 10.0, 12.0, 14.0, 16.0, "Why did they build the pyramids?"},
+     { 14.0, 16.0, 18.0, 20.0, "What is the meaning of Stone Henge?"},
+     { 18.0, 20.0, 22.0, 24.0, "What are the 7 wonders of the world?"},
+     { 22.0, 24.0, 26.0, 28.0, "What is the 8th wonder?"},
+     { 26.0, 28.0, 34.0, 36.0, "It is ..."},
+     { 40.0, 44.0, 48.0, 50.0, "Evas"}
+};
+
 /* functions */
 double
 get_time(void)
@@ -211,7 +231,7 @@ setup_view(Evas_Render_Method method)
    XSetWindowAttributes att;
    Evas_Object o;
    Evas e;
-   int w, h;
+   int w, h, i;
    double x, y;
 
    e = evas_new_all(display, win_base, 128, 0, 1024 - 128, 768,
@@ -226,6 +246,8 @@ setup_view(Evas_Render_Method method)
 		ButtonReleaseMask | PointerMotionMask | ExposureMask |
 		EnterWindowMask | LeaveWindowMask);
    XMapWindow(display, win_view);
+   
+   for (i = 0; i < (sizeof(texts) / sizeof(TextBlock)); i++) texts[i].o_text = NULL;
    if (evas_view) evas_free(evas_view);
    evas_view = e;
    
@@ -307,6 +329,60 @@ setup_view(Evas_Render_Method method)
    evas_object_set_name(e, o, "pointer");
 }
 
+void
+text(double val)
+{
+   int i;
+   
+   while (val > texts_loop) val -= texts_loop;
+   for (i = 0; i < (sizeof(texts) / sizeof(TextBlock)); i++)
+     {
+	if (!texts[i].o_text)
+	  {
+	     texts[i].o_text = evas_add_text(evas_view, "notepad", 32, texts[i].text);
+	     texts[i].o_shadow = evas_add_text(evas_view, "notepad", 32, texts[i].text);
+	     evas_set_color(evas_view, texts[i].o_text, 255, 255, 255, 255);
+	     evas_set_layer(evas_view, texts[i].o_text, 101);
+	     evas_set_color(evas_view, texts[i].o_shadow, 0, 0, 0, 128);
+	     evas_set_layer(evas_view, texts[i].o_shadow, 100);
+	  }
+	if ((val >= texts[i].time1) && (val <= texts[i].time4))
+	  {
+	     double tw, th, dx, dy;
+	     double alpha, a1;
+	     
+	     alpha = 255;
+	     if (val <= texts[i].time2)
+		alpha = ((val - texts[i].time1) / 
+			 (texts[i].time2 - texts[i].time1));
+	     else if (val <= texts[i].time3)
+		alpha = 1;
+	     else
+		alpha = 1.0 - ((val - texts[i].time3) / 
+			       (texts[i].time4 - texts[i].time3));
+	     a1 = 1 - alpha;
+	     dx = (a1 * a1 * a1 * a1) * 500 * sin(val * 2.3);
+	     dy = (a1 * a1 * a1 * a1) * 600 * cos(val * 3.7);
+	     evas_get_geometry(evas_view, texts[i].o_text, NULL, NULL, &tw, &th);
+	     evas_move(evas_view, texts[i].o_text, 
+		       ((1024 - 128 - tw) / 2) + dx,
+		       ((768 - th) / 2) + dy);
+	     evas_move(evas_view, texts[i].o_shadow, 
+		       ((1024 - 128 - tw) / 2) + 4 + dx,
+		       ((768 - th) / 2) + 4 + dy);
+	     evas_set_color(evas_view, texts[i].o_text, 255, 255, 255, 255 * alpha);
+	     evas_set_color(evas_view, texts[i].o_shadow, 0, 0, 0, 255 * alpha / 2);
+	     evas_show(evas_view, texts[i].o_text);
+	     evas_show(evas_view, texts[i].o_shadow);
+	  }
+	else
+	  {
+	     evas_hide(evas_view, texts[i].o_text);
+	     evas_hide(evas_view, texts[i].o_shadow);
+	  }
+     }
+}
+
 void
 animate(double val)
 {
@@ -350,7 +426,7 @@ animate(double val)
 	evas_hide(evas_view, o_logo);
 	evas_hide(evas_view, o_logo_shadow);
 	evas_set_color(evas_view, o_logo_impress, 255, 255, 255,
-		       (255 * (val - 30)) / 10);
+		       (255 * (val - 30)) / 20);
      }
    else
      {
@@ -490,6 +566,8 @@ animate(double val)
    evas_show(evas_view, o_shadow2);
    evas_show(evas_view, o_bubble3);
    evas_show(evas_view, o_shadow3);
+   
+   text(val);
 }
 
 void