enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

more params...... 

SVN revision: 3037
This commit is contained in:
Carsten Haitzler 2000-08-06 06:01:25 +00:00
parent f9ca2ac24c
commit 4700f60fa0
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/src/evas_gl_routines.c
View File

@ -334,7 +334,6 @@ __evas_gl_image_create_from_file(Display *disp, char *file)
im->texture.edge_h = 0;
im->texture.textures = NULL;
__evas_gl_init(disp);
im->context = __evas_gl_cx;
im->buffer.display = disp;
im->buffer.colormap = __evas_gl_get_colormap(disp, 0);
@ -710,12 +709,12 @@ __evas_gl_get_colormap(Display *disp, int screen)
}
void
__evas_gl_init(Display *disp)
__evas_gl_init(Display *disp, int screen)
{
if (__evas_gl_cx) return;
if (!__evas_gl_capable(disp)) return;
__evas_gl_get_visual(disp, 0);
__evas_gl_get_visual(disp, screen);
/* direct rendering client */
__evas_gl_cx = glXCreateContext(disp, __evas_vi, NULL, GL_TRUE);
/* GLX indirect */

2
legacy/evas/src/evas_gl_routines.h
View File

@ -112,7 +112,7 @@ void __evas_gl_text_draw(Evas_GL_Font *fn, Display *disp, Window win,
/***********/
/* drawing */
/***********/
void __evas_gl_init(Display *disp);
void __evas_gl_init(Display *disp, int screen);
int __evas_gl_capable(Display *disp);
void __evas_gl_flush_draw(Display *disp, Window win);
void __evas_gl_sync(Display *disp);

9
legacy/evas/src/evas_imlib_routines.c
View File

@ -343,12 +343,11 @@ __evas_imlib_get_colormap(Display *disp, int screen)
}
void
__evas_imlib_init(Display *disp)
__evas_imlib_init(Display *disp, int screen)
{
__evas_imlib_get_visual(disp, 0);
__evas_imlib_get_visual(disp, 0);
__evas_imlib_get_colormap(disp, 0);
imlib_context_set_display(disp);
__evas_imlib_get_visual(disp, screen);
__evas_imlib_get_visual(disp, screen);
__evas_imlib_get_colormap(disp, screen);
}
void

2
legacy/evas/src/evas_imlib_routines.h
View File

@ -74,7 +74,7 @@ void __evas_imlib_text_draw(Evas_Imlib_Font *fn, Display *disp, Win
/***********/
/* drawing */
/***********/
void __evas_imlib_init(Display *disp);
void __evas_imlib_init(Display *disp, int screen);
int __evas_imlib_capable(Display *disp);
void __evas_imlib_flush_draw(Display *disp, Window win);
void __evas_imlib_sync(Display *disp);

2
legacy/evas/test/evas_test.c
View File

@ -23,7 +23,7 @@ main(int argc, char **argv)
int win_w, win_h;
d = XOpenDisplay(NULL);
__evas_gl_init(d);
__evas_gl_init(d, DefaultScreen(d));
vis = __evas_gl_get_visual(d, DefaultScreen(d));
cmap = __evas_gl_get_colormap(d, DefaultScreen(d));