Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/gl_x11
Modified Files:
evas_engine.c evas_engine.h evas_x_main.c
Log Message:
GL engine goes in... its not 100% complete. fonts are sub-optimal. i quickly
hooked them in to work at all...
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_x11/evas_engine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_engine.c 14 Nov 2002 05:38:10 -0000 1.3
+++ evas_engine.c 4 Sep 2003 07:40:33 -0000 1.4
@@ -4,11 +4,12 @@
#include "evas_engine_api_gl_x11.h"
#include "Evas.h"
#include "Evas_Engine_GL_X11.h"
+#include "evas_gl_common.h"
static void *evas_engine_gl_x11_info(Evas *e);
static void evas_engine_gl_x11_info_free(Evas *e, void *info);
static void evas_engine_gl_x11_setup(Evas *e, void *info);
-static void *evas_engine_gl_x11_output_setup(int w, int h, int rot, Display *disp,
Drawable draw, Visual *vis, Colormap cmap, int depth);
+static void *evas_engine_gl_x11_output_setup(int w, int h, Display *disp, Drawable
draw, Visual *vis, Colormap cmap, int depth);
static void evas_engine_gl_x11_output_free(void *data);
static void evas_engine_gl_x11_output_resize(void *data, int w, int h);
static void evas_engine_gl_x11_output_tile_size_set(void *data, int w, int h);
@@ -82,7 +83,8 @@
struct _Render_Engine
{
- int end;
+ Evas_GL_X11_Window *win;
+ int end;
};
Evas_Func evas_engine_gl_x11_func =
@@ -175,6 +177,7 @@
info->func.best_visual_get = evas_engine_gl_x11_best_visual_get;
info->func.best_colormap_get = evas_engine_gl_x11_best_colormap_get;
info->func.best_depth_get = evas_engine_gl_x11_best_depth_get;
+ printf("GL: create info...\n");
return info;
e = NULL;
}
@@ -195,23 +198,41 @@
Evas_Engine_Info_GL_X11 *info;
info = (Evas_Engine_Info_GL_X11 *)in;
+ printf("GL: setup info...\n");
if (!e->engine.data.output)
- e->engine.data.output = 1;
+ e->engine.data.output =
+ evas_engine_gl_x11_output_setup(e->output.w,
+ e->output.h,
+ info->info.display,
+ info->info.drawable,
+ info->info.visual,
+ info->info.colormap,
+ info->info.depth);
if (!e->engine.data.output) return;
if (!e->engine.data.context)
e->engine.data.context =
- e->engine.func->context_new(e->engine.data.output);
-
+ e->engine.func->context_new(e->engine.data.output);
re = e->engine.data.output;
}
static void *
-evas_engine_gl_x11_output_setup(int w, int h, int rot, Display *disp, Drawable draw,
Visual *vis, Colormap cmap, int depth)
+evas_engine_gl_x11_output_setup(int w, int h, Display *disp, Drawable draw, Visual
*vis, Colormap cmap, int depth)
{
Render_Engine *re;
+ int eb, evb;
+ if (!glXQueryExtension(disp, &eb, &evb)) return NULL;
re = calloc(1, sizeof(Render_Engine));
- /* if we haven't initialized - init (automatic abort if already done) */
+
+ re->win = evas_engine_gl_x11_window_new(disp, draw,
+ 0 /* FIXME: screen 0 assumption */,
+ vis, cmap, depth, w, h);
+ if (!re->win)
+ {
+ free(re);
+ return NULL;
+ }
+ printf("GL: gl window setup done.\n");
evas_common_cpu_init();
evas_common_blend_init();
@@ -226,8 +247,6 @@
evas_common_draw_init();
evas_common_tilebuf_init();
- evas_gl_x11_init();
-
return re;
}
@@ -246,6 +265,9 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ re->win->w = w;
+ re->win->h = h;
+ evas_gl_common_context_resize(re->win->gl_context, w, h);
}
static void
@@ -262,6 +284,22 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ /* smple bounding box */
+ if (!re->win->draw.redraw)
+ {
+ re->win->draw.x1 = x;
+ re->win->draw.y1 = y;
+ re->win->draw.x2 = x + w - 1;
+ re->win->draw.y2 = y + h - 1;
+ }
+ else
+ {
+ if (x < re->win->draw.x1) re->win->draw.x1 = x;
+ if (y < re->win->draw.y1) re->win->draw.y1 = y;
+ if ((x + w - 1) > re->win->draw.x2) re->win->draw.x2 = x + w - 1;
+ if ((y + h - 1) > re->win->draw.y2) re->win->draw.y2 = y + h - 1;
+ }
+ re->win->draw.redraw = 1;
}
static void
@@ -278,6 +316,8 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ re->win->draw.redraw = 0;
+// printf("GL: finish update cycle!\n");
}
static void *
@@ -286,6 +326,22 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ /* get the upate rect surface - return engine data as dummy */
+ if (!re->win->draw.redraw)
+ {
+// printf("GL: NO updates!\n");
+ return NULL;
+ }
+// printf("GL: update....!\n");
+ if (x) *x = re->win->draw.x1;
+ if (y) *y = re->win->draw.y1;
+ if (w) *w = re->win->draw.x2 - re->win->draw.x1 + 1;
+ if (h) *h = re->win->draw.y2 - re->win->draw.y1 + 1;
+ if (cx) *cx = re->win->draw.x1;
+ if (cy) *cy = re->win->draw.y1;
+ if (cw) *cw = re->win->draw.x2 - re->win->draw.x1 + 1;
+ if (ch) *ch = re->win->draw.y2 - re->win->draw.y1 + 1;
+ return re;
}
static void
@@ -294,15 +350,33 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ /* put back update surface.. in this case just unflag redraw */
+// printf("GL: update done.\n");
+ re->win->draw.redraw = 0;
}
static void
evas_engine_gl_x11_output_flush(void *data)
{
Render_Engine *re;
+ static int fr = 0;
re = (Render_Engine *)data;
-/* XSync(re->ob->priv.x.disp, False); */
+// printf("GL: flush your mush!\n");
+ evas_engine_gl_x11_window_use(re->win);
+
+/* SLOW AS ALL HELL! */
+/*
+ evas_gl_common_swap_rect(re->win->gl_context,
+ re->win->draw.x1, re->win->draw.y1,
+ re->win->draw.x2 - re->win->draw.x1 + 1,
+ re->win->draw.y2 - re->win->draw.y1 + 1);
+ */
+ glXSwapBuffers(re->win->disp, re->win->win);
+ glFlush();
+// glXWaitGL();
+// XSync(re->win->disp, False);
+// printf("SYNC! %i\n", fr++);
}
static void *
@@ -311,6 +385,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_draw_context_new();
}
static void
@@ -319,6 +394,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_draw_context_free(context);
}
static void
@@ -327,6 +403,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_draw_context_set_clip(context, x, y, w, h);
}
static void
@@ -335,6 +412,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_draw_context_clip_clip(context, x, y, w, h);
}
static void
@@ -343,6 +421,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_draw_context_unset_clip(context);
}
static int
@@ -351,6 +430,11 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ *x = ((RGBA_Draw_Context *)context)->clip.x;
+ *y = ((RGBA_Draw_Context *)context)->clip.y;
+ *w = ((RGBA_Draw_Context *)context)->clip.w;
+ *h = ((RGBA_Draw_Context *)context)->clip.h;
+ return ((RGBA_Draw_Context *)context)->clip.use;
}
static void
@@ -359,6 +443,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_draw_context_set_color(context, r, g, b, a);
}
static int
@@ -367,6 +452,11 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->col.col));
+ *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->col.col));
+ *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->col.col));
+ *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->col.col));
+ return 1;
}
static void
@@ -375,6 +465,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_draw_context_set_multiplier(context, r, g, b, a);
}
static void
@@ -383,6 +474,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_draw_context_unset_multiplier(context);
}
static int
@@ -391,6 +483,11 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->mul.col));
+ *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->mul.col));
+ *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->mul.col));
+ *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->mul.col));
+ return ((RGBA_Draw_Context *)context)->mul.use;
}
static void
@@ -399,6 +496,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ /* not used in gl engine */
}
static void
@@ -407,6 +505,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ /* not used in gl engine */
}
@@ -420,6 +519,8 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_engine_gl_x11_window_use(re->win);
+ evas_gl_common_rect_draw(re->win->gl_context, context, x, y, w, h);
}
static void
@@ -428,6 +529,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_gl_common_line_draw(re->win->gl_context, context, x1, y1, x2, y2);
}
static void *
@@ -436,6 +538,8 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_gl_common_poly_point_add(polygon, x, y);
+
}
static void *
@@ -444,6 +548,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_gl_common_poly_points_clear(polygon);
}
static void
@@ -452,6 +557,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_gl_common_poly_draw(re->win->gl_context, context, polygon);
}
static void *
@@ -460,6 +566,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_gl_common_gradient_color_add(gradient, r, g, b, a, distance);
}
static void *
@@ -468,6 +575,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_gl_common_gradient_colors_clear(gradient);
}
static void
@@ -476,6 +584,8 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_engine_gl_x11_window_use(re->win);
+ evas_gl_common_gradient_draw(re->win->gl_context, context, gradient, x, y, w, h,
angle);
}
static void *
@@ -484,6 +594,9 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ *error = 0;
+ evas_engine_gl_x11_window_use(re->win);
+ return evas_gl_common_image_load(re->win->gl_context, file, key);
}
static void *
@@ -492,6 +605,8 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_engine_gl_x11_window_use(re->win);
+ return evas_gl_common_image_new_from_data(re->win->gl_context, w, h, image_data);
}
static void *
@@ -500,6 +615,8 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_engine_gl_x11_window_use(re->win);
+ return evas_gl_common_image_new_from_copied_data(re->win->gl_context, w, h,
image_data);
}
static void
@@ -508,6 +625,8 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_engine_gl_x11_window_use(re->win);
+ evas_gl_common_image_free(image);
}
static void
@@ -516,46 +635,120 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ if (w) *w = ((Evas_GL_Image *)image)->im->image->w;
+ if (h) *h = ((Evas_GL_Image *)image)->im->image->h;
}
static void *
evas_engine_gl_x11_image_size_set(void *data, void *image, int w, int h)
{
Render_Engine *re;
+ Evas_GL_Image *im, *im_old;
re = (Render_Engine *)data;
+ evas_engine_gl_x11_window_use(re->win);
+ if (!image) return NULL;
+ im_old = image;
+ im = evas_gl_common_image_new(re->win->gl_context, w, h);
+ if (im_old)
+ {
+ evas_common_load_image_data_from_file(im_old->im);
+ if (im_old->im->image->data)
+ {
+ evas_common_blit_rectangle(im_old->im, im->im, 0, 0, w, h, 0, 0);
+ evas_common_cpu_end_opt();
+ }
+ evas_gl_common_image_free(im_old);
+ }
+ return im;
}
static void *
evas_engine_gl_x11_image_dirty_region(void *data, void *image, int x, int y, int w,
int h)
{
Render_Engine *re;
+ Evas_GL_Image *im;
re = (Render_Engine *)data;
+ evas_gl_common_image_dirty(image);
+ return image;
}
static void *
evas_engine_gl_x11_image_data_get(void *data, void *image, int to_write, DATA32
**image_data)
{
Render_Engine *re;
+ Evas_GL_Image *im;
re = (Render_Engine *)data;
+ im = image;
+ evas_engine_gl_x11_window_use(re->win);
+ evas_common_load_image_data_from_file(im->im);
+ if (to_write)
+ {
+ if (im->references > 1)
+ {
+ Evas_GL_Image *im_new;
+
+ im_new = evas_gl_common_image_new_from_copied_data(im->gc,
im->im->image->w, im->im->image->h, im->im->image->data);
+ if (!im_new) return im;
+ im = im_new;
+ }
+ else
+ evas_gl_common_image_dirty(im);
+ }
+ *image_data = im->im->image->data;
+ return im;
}
static void *
evas_engine_gl_x11_image_data_put(void *data, void *image, DATA32 *image_data)
{
Render_Engine *re;
+ Evas_GL_Image *im;
re = (Render_Engine *)data;
+ im = image;
+ evas_engine_gl_x11_window_use(re->win);
+ if (image_data != im->im->image->data)
+ {
+ int w, h;
+
+ w = im->im->image->w;
+ h = im->im->image->h;
+ evas_gl_common_image_free(im);
+ return evas_engine_gl_x11_image_new_from_data(data, w, h, image_data);
+ }
+ /* hmmm - but if we wrote... why bother? */
+/* evas_gl_common_image_dirty(im); */
+ return im;
}
static void *
evas_engine_gl_x11_image_alpha_set(void *data, void *image, int has_alpha)
{
Render_Engine *re;
+ Evas_GL_Image *im;
re = (Render_Engine *)data;
+ evas_engine_gl_x11_window_use(re->win);
+ im = image;
+ if (im->references > 1)
+ {
+ Evas_GL_Image *im_new;
+
+ im_new = evas_gl_common_image_new_from_copied_data(im->gc, im->im->image->w,
im->im->image->h, im->im->image->data);
+ if (!im_new) return im;
+ evas_gl_common_image_free(im);
+ im = im_new;
+ }
+ else
+ evas_gl_common_image_dirty(im);
+ if (has_alpha)
+ im->im->flags |= RGBA_IMAGE_HAS_ALPHA;
+ else
+ im->im->flags &= ~RGBA_IMAGE_HAS_ALPHA;
+ return image;
}
@@ -563,40 +756,61 @@
evas_engine_gl_x11_image_alpha_get(void *data, void *image)
{
Render_Engine *re;
+ Evas_GL_Image *im;
re = (Render_Engine *)data;
+ im = image;
+ evas_engine_gl_x11_window_use(re->win);
+ if (im->im->flags & RGBA_IMAGE_HAS_ALPHA) return 1;
+ return 0;
}
static void
evas_engine_gl_x11_image_draw(void *data, void *context, void *surface, void *image,
int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int
dst_h, int smooth)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
+ evas_engine_gl_x11_window_use(re->win);
+ evas_gl_common_image_draw(re->win->gl_context, context, image,
+ src_x, src_y, src_w, src_h,
+ dst_x, dst_y, dst_w, dst_h,
+ smooth);
}
static char *
evas_engine_gl_x11_image_comment_get(void *data, void *image, char *key)
{
Render_Engine *re;
+ Evas_GL_Image *im;
re = (Render_Engine *)data;
+ im = image;
+ return im->im->info.comment;
}
static char *
evas_engine_gl_x11_image_format_get(void *data, void *image)
{
Render_Engine *re;
+ Evas_GL_Image *im;
re = (Render_Engine *)data;
+ im = image;
+ if (im->im->info.format == 1) return "png";
+ return NULL;
}
static void
evas_engine_gl_x11_image_cache_flush(void *data)
{
Render_Engine *re;
+ int tmp_size;
re = (Render_Engine *)data;
+ tmp_size = evas_common_image_get_cache();
+ evas_common_image_set_cache(0);
+ evas_common_image_set_cache(tmp_size);
}
static void
@@ -605,6 +819,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_image_set_cache(bytes);
}
static int
@@ -613,6 +828,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_image_get_cache();
}
static void *
@@ -621,6 +837,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_load(name, size);
}
static void
@@ -629,6 +846,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_font_free(font);
}
static int
@@ -637,6 +855,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_ascent_get(font);
}
static int
@@ -645,6 +864,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_descent_get(font);
}
static int
@@ -653,6 +873,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_max_ascent_get(font);
}
static int
@@ -661,6 +882,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_max_descent_get(font);
}
static void
@@ -669,6 +891,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_font_query_size(font, text, w, h);
}
static int
@@ -677,22 +900,29 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_query_inset(font, text);
}
static int
evas_engine_gl_x11_font_h_advance_get(void *data, void *font, char *text)
{
Render_Engine *re;
+ int h, v;
re = (Render_Engine *)data;
+ evas_common_font_query_advance(font, text, &h, &v);
+ return h;
}
static int
evas_engine_gl_x11_font_v_advance_get(void *data, void *font, char *text)
{
Render_Engine *re;
-
+ int h, v;
+
re = (Render_Engine *)data;
+ evas_common_font_query_advance(font, text, &h, &v);
+ return v;
}
static int
@@ -701,6 +931,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_query_char_coords(font, text, pos, cx, cy, cw, ch);
}
static int
@@ -709,6 +940,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch);
}
static void
@@ -717,6 +949,76 @@
Render_Engine *re;
re = (Render_Engine *)data;
+#define GL_TXT 1
+
+#ifdef GL_TXT
+ {
+ /* create output surface size ow x oh and scale to w x h */
+ RGBA_Draw_Context *dc;
+ RGBA_Image *im;
+
+ dc = context;
+ im = evas_common_image_create(ow, oh);
+ if (im)
+ {
+ int max_ascent;
+ int i, j;
+ RGBA_Draw_Context *dct;
+
+ im->flags |= RGBA_IMAGE_HAS_ALPHA;
+ j = ow * oh;
+ memset(im->image->data, 0, j * sizeof(DATA32));
+ max_ascent = evas_common_font_max_ascent_get(font);
+ dct = evas_common_draw_context_new();
+ if (dct)
+ {
+ evas_common_draw_context_set_color(dct, 255, 255, 255, 255);
+ evas_common_font_draw(im, dct, font, 0, max_ascent, text);
+ evas_common_cpu_end_opt();
+ evas_common_draw_context_free(dct);
+ }
+ {
+ Evas_GL_Texture *tex;
+ Evas_GL_Context *gc;
+ double tx1, ty1, tx2, ty2;
+ int r, g, b, a;
+
+ gc = re->win->gl_context;
+ tex = evas_gl_common_texture_new(gc, im, 0);
+ evas_gl_common_context_texture_set(gc, tex, 0, w, h);
+ tx1 = 0;
+ ty1 = 0;
+ tx2 = (double)(ow) / (double)(tex->w);
+ ty2 = (double)(oh) / (double)(tex->h);
+ a = (dc->col.col >> 24) & 0xff;
+ r = (dc->col.col >> 16) & 0xff;
+ g = (dc->col.col >> 8 ) & 0xff;
+ b = (dc->col.col ) & 0xff;
+ evas_gl_common_context_color_set(gc, r, g, b, a);
+ evas_gl_common_context_blend_set(gc, 1);
+ if (dc->clip.use)
+ evas_gl_common_context_clip_set(gc, 1,
+ dc->clip.x, dc->clip.y,
+ dc->clip.w, dc->clip.h);
+ else
+ evas_gl_common_context_clip_set(gc, 0,
+ 0, 0, 0, 0);
+ evas_gl_common_context_read_buf_set(gc, GL_BACK);
+ evas_gl_common_context_write_buf_set(gc, GL_BACK);
+
+ glBegin(GL_QUADS);
+ glTexCoord2d(tx1, ty1); glVertex2i(x , y - ((max_ascent * h) /
oh));
+ glTexCoord2d(tx2, ty1); glVertex2i(x + w, y - ((max_ascent * h) /
oh));
+ glTexCoord2d(tx2, ty2); glVertex2i(x + w, y - ((max_ascent * h) /
oh) + h);
+ glTexCoord2d(tx1, ty2); glVertex2i(x , y - ((max_ascent * h) /
oh) + h);
+ glEnd();
+
+ evas_gl_common_texture_free(tex);
+ }
+ evas_common_image_free(im);
+ }
+ }
+#endif
}
static void
@@ -725,6 +1027,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_font_flush();
}
static void
@@ -733,6 +1036,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ evas_common_font_cache_set(bytes);
}
static int
@@ -741,6 +1045,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ return evas_common_font_cache_get();
}
@@ -757,19 +1062,31 @@
evas_engine_gl_x11_best_visual_get(Display *disp, int screen)
{
if (!disp) return NULL;
- return DefaultVisual(disp, screen);
+ if (!_evas_gl_x11_vi)
+ _evas_gl_x11_vi = glXChooseVisual(disp, screen,
+ _evas_gl_x11_configuration);
+ if (!_evas_gl_x11_vi) return NULL;
+ return _evas_gl_x11_vi->visual;
}
static Colormap
evas_engine_gl_x11_best_colormap_get(Display *disp, int screen)
{
if (!disp) return 0;
- return DefaultColormap(disp, screen);
+ if (!_evas_gl_x11_vi)
+ evas_engine_gl_x11_best_visual_get(disp, screen);
+ if (!_evas_gl_x11_vi) return 0;
+ _evas_gl_x11_cmap = XCreateColormap(disp, RootWindow(disp, screen),
+ _evas_gl_x11_vi->visual, 0);
+ return _evas_gl_x11_cmap;
}
static int
evas_engine_gl_x11_best_depth_get(Display *disp, int screen)
{
if (!disp) return 0;
- return DefaultDepth(disp, screen);
+ if (!_evas_gl_x11_vi)
+ evas_engine_gl_x11_best_visual_get(disp, screen);
+ if (!_evas_gl_x11_vi) return 0;
+ return _evas_gl_x11_vi->depth;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_x11/evas_engine.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_engine.h 14 Nov 2002 05:23:54 -0000 1.2
+++ evas_engine.h 4 Sep 2003 07:40:33 -0000 1.3
@@ -1,13 +1,44 @@
#ifndef EVAS_ENGINE_H
#define EVAS_ENGINE_H
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
+#include "evas_gl_common.h"
-/* data structs go here for engine internals */
+typedef struct _Evas_GL_X11_Window Evas_GL_X11_Window;
-/****/
-void evas_gl_x11_init (void);
+struct _Evas_GL_X11_Window
+{
+ Display *disp;
+ Window win;
+ int w, h;
+ int screen;
+ XVisualInfo *visualinfo;
+ Visual *visual;
+ Colormap colormap;
+ int depth;
+ GLXContext context;
+ Evas_GL_Context *gl_context;
+ struct {
+ int redraw : 1;
+ int x1, y1, x2, y2;
+ } draw;
+};
+extern int _evas_gl_x11_configuration[9];
+extern XVisualInfo *_evas_gl_x11_vi;
+extern Colormap _evas_gl_x11_cmap;
+
+Evas_GL_X11_Window *
+ evas_engine_gl_x11_window_new(Display *disp,
+ Window win,
+ int screen,
+ Visual *vis,
+ Colormap cmap,
+ int depth,
+ int w,
+ int h);
+void
+ evas_engine_gl_x11_window_free(Evas_GL_X11_Window *gw);
+void
+ evas_engine_gl_x11_window_use(Evas_GL_X11_Window *gw);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_x11/evas_x_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_x_main.c 14 Nov 2002 05:23:54 -0000 1.2
+++ evas_x_main.c 4 Sep 2003 07:40:33 -0000 1.3
@@ -1,10 +1,82 @@
#include "evas_common.h"
+#include "evas_private.h"
#include "evas_engine.h"
+#include "evas_engine_api_gl_x11.h"
+#include "Evas.h"
+#include "Evas_Engine_GL_X11.h"
+#include "evas_gl_common.h"
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+static Evas_GL_X11_Window *_evas_gl_x11_window = NULL;
+
+/* FIXME: this will only work for 1 display connection... :( */
+static GLXContext context = 0;
+
+int _evas_gl_x11_configuration[9] =
+{
+ GLX_DOUBLEBUFFER,
+ GLX_RGBA,
+ GLX_RED_SIZE, 1,
+ GLX_GREEN_SIZE, 1,
+ GLX_BLUE_SIZE, 1,
+ None
+};
+
+XVisualInfo *_evas_gl_x11_vi = NULL;
+Colormap _evas_gl_x11_cmap = 0;
+
+Evas_GL_X11_Window *
+evas_engine_gl_x11_window_new(Display *disp,
+ Window win,
+ int screen,
+ Visual *vis,
+ Colormap cmap,
+ int depth,
+ int w,
+ int h)
+{
+ Evas_GL_X11_Window *gw;
+
+ if (!_evas_gl_x11_vi) return NULL;
+ gw = calloc(1, sizeof(Evas_GL_X11_Window));
+ if (!gw) return NULL;
+ gw->disp = disp;
+ gw->win = win;
+ gw->screen = screen;
+ gw->visual = vis;
+ gw->colormap = cmap;
+ gw->depth = depth;
+
+ gw->visualinfo = _evas_gl_x11_vi;
+ if (!context)
+ context = glXCreateContext(disp, gw->visualinfo, NULL, GL_TRUE);
+ gw->context = context;
+ gw->gl_context = evas_gl_common_context_new();
+ if (!gw->gl_context)
+ {
+ glXDestroyContext(gw->disp, gw->context);
+ free(gw);
+ return NULL;
+ }
+ evas_gl_common_context_resize(gw->gl_context, w, h);
+ return gw;
+}
+
+void
+evas_engine_gl_x11_window_free(Evas_GL_X11_Window *gw)
+{
+ if (gw == _evas_gl_x11_window) _evas_gl_x11_window = NULL;
+ evas_gl_common_context_free(gw->gl_context);
+ glXDestroyContext(gw->disp, gw->context);
+ free(gw);
+}
void
-evas_gl_x11_init(void)
+evas_engine_gl_x11_window_use(Evas_GL_X11_Window *gw)
{
+ if (_evas_gl_x11_window != gw)
+ {
+ _evas_gl_x11_window = gw;
+ glXMakeCurrent(gw->disp, gw->win, gw->context);
+ }
+ evas_gl_common_context_use(gw->gl_context);
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
