From 4700f60fa064c9d390d6c7e3869cdb79dff2f14d Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sun, 6 Aug 2000 06:01:25 +0000
Subject: [PATCH] more params......

SVN revision: 3037
---
 legacy/evas/src/evas_gl_routines.c    | 5 ++---
 legacy/evas/src/evas_gl_routines.h    | 2 +-
 legacy/evas/src/evas_imlib_routines.c | 9 ++++-----
 legacy/evas/src/evas_imlib_routines.h | 2 +-
 legacy/evas/test/evas_test.c          | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/legacy/evas/src/evas_gl_routines.c b/legacy/evas/src/evas_gl_routines.c
index fe0407c97b..68b52f9b36 100644
--- a/legacy/evas/src/evas_gl_routines.c
+++ b/legacy/evas/src/evas_gl_routines.c
@@ -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 */
diff --git a/legacy/evas/src/evas_gl_routines.h b/legacy/evas/src/evas_gl_routines.h
index d2dd9ef01d..d0ed1b6df0 100644
--- a/legacy/evas/src/evas_gl_routines.h
+++ b/legacy/evas/src/evas_gl_routines.h
@@ -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);
diff --git a/legacy/evas/src/evas_imlib_routines.c b/legacy/evas/src/evas_imlib_routines.c
index 7317b3cae6..b7d8919373 100644
--- a/legacy/evas/src/evas_imlib_routines.c
+++ b/legacy/evas/src/evas_imlib_routines.c
@@ -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
diff --git a/legacy/evas/src/evas_imlib_routines.h b/legacy/evas/src/evas_imlib_routines.h
index b465876d3e..ff0895b44a 100644
--- a/legacy/evas/src/evas_imlib_routines.h
+++ b/legacy/evas/src/evas_imlib_routines.h
@@ -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);
diff --git a/legacy/evas/test/evas_test.c b/legacy/evas/test/evas_test.c
index 03f57ea7ea..5e25eb8936 100644
--- a/legacy/evas/test/evas_test.c
+++ b/legacy/evas/test/evas_test.c
@@ -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));