summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-01-25 14:29:30 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-01-25 14:29:30 +0000
commit7d25128c3d8e195e6ed3c2ecbe24905dcf2ffd2b (patch)
treee941488a357886a8e2d89ca62a32d36f401bee0c /legacy/evas/src/modules/engines/gl_x11/evas_engine.c
parent47ad18fafcebd8c9e0b0f01fc60387742123525b (diff)
more debug
SVN revision: 45554
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/evas_engine.c25
1 files changed, 12 insertions, 13 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 f469d145ad..6184961465 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -55,12 +55,6 @@ _sym_init(void)
55 FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImage"); 55 FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImage");
56 FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageEXT"); 56 FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageEXT");
57 FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageARB"); 57 FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageARB");
58
59 printf("glXGetProcAddress: %p\n"
60 "glXBindTexImage: %p\n"
61 "glXReleaseTexImage: %p\n",
62 glsym_glXGetProcAddress,
63 glsym_glXBindTexImage, glsym_glXReleaseTexImage);
64#endif 58#endif
65} 59}
66 60
@@ -127,7 +121,6 @@ eng_setup(Evas *e, void *in)
127 re->info = info; 121 re->info = info;
128 re->evas = e; 122 re->evas = e;
129 e->engine.data.output = re; 123 e->engine.data.output = re;
130 printf("eng_window_new: %i %i\n", e->output.w, e->output.h);
131 re->win = eng_window_new(info->info.display, 124 re->win = eng_window_new(info->info.display,
132 info->info.drawable, 125 info->info.drawable,
133 0 /* FIXME: screen 0 assumption */, 126 0 /* FIXME: screen 0 assumption */,
@@ -213,7 +206,6 @@ eng_setup(Evas *e, void *in)
213 (info->info.colormap != re->win->colormap) || 206 (info->info.colormap != re->win->colormap) ||
214 (info->info.depth != re->win->depth)) 207 (info->info.depth != re->win->depth))
215 { 208 {
216 printf("re-init eng_window_new: %i %i\n", e->output.w, e->output.h);
217 eng_window_free(re->win); 209 eng_window_free(re->win);
218 re->win = eng_window_new(info->info.display, 210 re->win = eng_window_new(info->info.display,
219 info->info.drawable, 211 info->info.drawable,
@@ -227,7 +219,6 @@ eng_setup(Evas *e, void *in)
227 else if ((re->win->w != e->output.w) || 219 else if ((re->win->w != e->output.w) ||
228 (re->win->h != e->output.h)) 220 (re->win->h != e->output.h))
229 { 221 {
230 printf("resize eng_window_new: %i %i\n", e->output.w, e->output.h);
231 re->win->w = e->output.w; 222 re->win->w = e->output.w;
232 re->win->h = e->output.h; 223 re->win->h = e->output.h;
233 eng_window_use(re->win); 224 eng_window_use(re->win);
@@ -416,7 +407,6 @@ eng_output_flush(void *data)
416 407
417#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) 408#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
418// glFlush(); 409// glFlush();
419 printf("eglSwapBuffers(%p, %p)\n", re->win->egl_disp, re->win->egl_surface[0]);
420 eglSwapBuffers(re->win->egl_disp, re->win->egl_surface[0]); 410 eglSwapBuffers(re->win->egl_disp, re->win->egl_surface[0]);
421#else 411#else
422# ifdef VSYNC_TO_SCREEN 412# ifdef VSYNC_TO_SCREEN
@@ -1187,6 +1177,7 @@ eng_image_native_set(void *data, void *image, void *native)
1187 if (im->native.func.free) 1177 if (im->native.func.free)
1188 im->native.func.free(im->native.func.data, im); 1178 im->native.func.free(im->native.func.data, im);
1189 evas_gl_common_image_native_disable(im); 1179 evas_gl_common_image_native_disable(im);
1180 im->native.data = NULL;
1190 } 1181 }
1191 if (native) 1182 if (native)
1192 { 1183 {
@@ -1209,15 +1200,22 @@ eng_image_native_set(void *data, void *image, void *native)
1209 config_attrs[i++] = EGL_ALPHA_SIZE; 1200 config_attrs[i++] = EGL_ALPHA_SIZE;
1210 config_attrs[i++] = 8; 1201 config_attrs[i++] = 8;
1211 config_attrs[i++] = EGL_DEPTH_SIZE; 1202 config_attrs[i++] = EGL_DEPTH_SIZE;
1212 config_attrs[i++] = 32; 1203 config_attrs[i++] = 0;
1204 config_attrs[i++] = EGL_STENCIL_SIZE;
1205 config_attrs[i++] = 0;
1213 config_attrs[i++] = EGL_RENDERABLE_TYPE; 1206 config_attrs[i++] = EGL_RENDERABLE_TYPE;
1214 config_attrs[i++] = EGL_OPENGL_ES2_BIT; 1207 config_attrs[i++] = EGL_OPENGL_ES2_BIT;
1215 config_attrs[i++] = EGL_SURFACE_TYPE; 1208 config_attrs[i++] = EGL_SURFACE_TYPE;
1216 config_attrs[i++] = EGL_PIXMAP_BIT; 1209 config_attrs[i++] = EGL_PIXMAP_BIT;
1217 config_attrs[i++] = EGL_NONE; 1210 config_attrs[i++] = EGL_NONE;
1218 1211
1219 eglChooseConfig(re->win->egl_disp, config_attrs, 1212 printf("glsym_eglBindTexImage = %p\n", glsym_eglBindTexImage);
1220 &egl_config, 1, &num_config); 1213 printf("glsym_eglReleaseTexImage = %p\n", glsym_eglReleaseTexImage);
1214 if (!eglChooseConfig(re->win->egl_disp, config_attrs,
1215 &egl_config, 1, &num_config))
1216 {
1217 printf("ERROR: eglChooseConfig() failed for pixmap 0x%x, num_config = %i\n", pm, num_config);
1218 }
1221 n->pixmap = pm; 1219 n->pixmap = pm;
1222 n->visual = vis; 1220 n->visual = vis;
1223 im->native.yinvert = 1; 1221 im->native.yinvert = 1;
@@ -1230,6 +1228,7 @@ eng_image_native_set(void *data, void *image, void *native)
1230 n->egl_surface = eglCreatePixmapSurface(re->win->egl_disp, 1228 n->egl_surface = eglCreatePixmapSurface(re->win->egl_disp,
1231 egl_config, pm, 1229 egl_config, pm,
1232 NULL); 1230 NULL);
1231 printf("eglCreatePixmapSurface for 0x%x = %p\n", pm, n->egl_surface);
1233 evas_gl_common_image_native_enable(im); 1232 evas_gl_common_image_native_enable(im);
1234 } 1233 }
1235 } 1234 }