summaryrefslogtreecommitdiff
path: root/legacy/evas
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-09-28 04:07:53 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-09-28 04:07:53 +0000
commit0d75dc3a64e142664d20cbd41c5b7a5fa7134295 (patch)
tree0a4b547687b9815494dd5c607cc7a7e4e2289555 /legacy/evas
parent56ffcbe9e542922396ebfc21c1309b9bd79141ae (diff)
dont need bounding box tracking anymore
SVN revision: 77176
Diffstat (limited to 'legacy/evas')
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/evas_engine.c28
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/evas_engine.h4
2 files changed, 1 insertions, 31 deletions
diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
index 21fd3b63e3..6d3f33e983 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -927,32 +927,6 @@ eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
927 eng_window_use(re->win); 927 eng_window_use(re->win);
928 evas_gl_common_context_resize(re->win->gl_context, re->win->w, re->win->h, re->win->rot); 928 evas_gl_common_context_resize(re->win->gl_context, re->win->w, re->win->h, re->win->rot);
929 evas_common_tilebuf_add_redraw(re->tb, x, y, w, h); 929 evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
930
931 /* bounding box track */
932 RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, re->win->w, re->win->h);
933 if ((w <= 0) || (h <= 0)) return;
934 if (!re->win->draw.redraw)
935 {
936#if 1
937 re->win->draw.x1 = x;
938 re->win->draw.y1 = y;
939 re->win->draw.x2 = x + w - 1;
940 re->win->draw.y2 = y + h - 1;
941#else
942 re->win->draw.x1 = 0;
943 re->win->draw.y1 = 0;
944 re->win->draw.x2 = re->win->w - 1;
945 re->win->draw.y2 = re->win->h - 1;
946#endif
947 }
948 else
949 {
950 if (x < re->win->draw.x1) re->win->draw.x1 = x;
951 if (y < re->win->draw.y1) re->win->draw.y1 = y;
952 if ((x + w - 1) > re->win->draw.x2) re->win->draw.x2 = x + w - 1;
953 if ((y + h - 1) > re->win->draw.y2) re->win->draw.y2 = y + h - 1;
954 }
955 re->win->draw.redraw = 1;
956} 930}
957 931
958static void 932static void
@@ -971,7 +945,6 @@ eng_output_redraws_clear(void *data)
971 945
972 re = (Render_Engine *)data; 946 re = (Render_Engine *)data;
973 evas_common_tilebuf_clear(re->tb); 947 evas_common_tilebuf_clear(re->tb);
974/* re->win->draw.redraw = 0;*/
975// INF("GL: finish update cycle!"); 948// INF("GL: finish update cycle!");
976} 949}
977 950
@@ -1172,7 +1145,6 @@ eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x
1172 re = (Render_Engine *)data; 1145 re = (Render_Engine *)data;
1173 /* put back update surface.. in this case just unflag redraw */ 1146 /* put back update surface.. in this case just unflag redraw */
1174 if (!_re_wincheck(re)) return; 1147 if (!_re_wincheck(re)) return;
1175 re->win->draw.redraw = 0;
1176 re->win->draw.drew = 1; 1148 re->win->draw.drew = 1;
1177 evas_gl_common_context_flush(re->win->gl_context); 1149 evas_gl_common_context_flush(re->win->gl_context);
1178 if (safe_native == -1) 1150 if (safe_native == -1)
diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.h b/legacy/evas/src/modules/engines/gl_x11/evas_engine.h
index 3778698b4a..f52caf47f7 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.h
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.h
@@ -73,9 +73,7 @@ struct _Evas_GL_X11_Window
73 int rot; 73 int rot;
74 Evas_Engine_GL_Context *gl_context; 74 Evas_Engine_GL_Context *gl_context;
75 struct { 75 struct {
76 int redraw : 1; 76 int drew : 1;
77 int drew : 1;
78 int x1, y1, x2, y2;
79 } draw; 77 } draw;
80#ifdef GL_GLES 78#ifdef GL_GLES
81 EGLContext egl_context[1]; 79 EGLContext egl_context[1];