summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-16 18:46:36 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-16 18:46:36 +0900
commit3411fccc1eededc349d8e131643e77015c9fde24 (patch)
treec9912c17f26488b9b2f72d4c61983d808aa03ee7 /src
parent79e87c1e09091bf740acf8957800dbebf1521a57 (diff)
evas - gl - osmesa also try older osmesa major versions
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c29
1 files changed, 18 insertions, 11 deletions
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index a42cd9cb72..5cb07c7892 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -2375,11 +2375,11 @@ eng_gl_context_create(void *data EINA_UNUSED, void *share_context)
2375 2375
2376 ctx->share_ctx = share_ctx; 2376 ctx->share_ctx = share_ctx;
2377 2377
2378 /* 2378#if 0
2379 if (share_ctx) 2379 if (share_ctx)
2380 ctx->context = OSMesaCreateContextExt( OSMESA_RGBA, 8, 0, 0, share_ctx->context ); 2380 ctx->context = _sym_OSMesaCreateContextExt( OSMESA_RGBA, 8, 0, 0, share_ctx->context );
2381 else 2381 else
2382 ctx->context = OSMesaCreateContextExt( OSMESA_RGBA, 8, 0, 0, NULL ); 2382 ctx->context = _sym_OSMesaCreateContextExt( OSMESA_RGBA, 8, 0, 0, NULL );
2383 2383
2384 2384
2385 if (!ctx->context) 2385 if (!ctx->context)
@@ -2388,7 +2388,7 @@ eng_gl_context_create(void *data EINA_UNUSED, void *share_context)
2388 free(ctx); 2388 free(ctx);
2389 return NULL; 2389 return NULL;
2390 } 2390 }
2391 */ 2391#endif
2392 2392
2393 ctx->initialized = 0; 2393 ctx->initialized = 0;
2394 2394
@@ -2450,10 +2450,10 @@ eng_gl_make_current(void *data EINA_UNUSED, void *surface, void *context)
2450 share_ctx = NULL; 2450 share_ctx = NULL;
2451 2451
2452 ctx->context = _sym_OSMesaCreateContextExt(sfc->internal_fmt, 2452 ctx->context = _sym_OSMesaCreateContextExt(sfc->internal_fmt,
2453 sfc->depth_bits, 2453 sfc->depth_bits,
2454 sfc->stencil_bits, 2454 sfc->stencil_bits,
2455 0, 2455 0,
2456 share_ctx); 2456 share_ctx);
2457 if (!ctx->context) 2457 if (!ctx->context)
2458 { 2458 {
2459 ERR("Error initializing context."); 2459 ERR("Error initializing context.");
@@ -2466,7 +2466,7 @@ eng_gl_make_current(void *data EINA_UNUSED, void *surface, void *context)
2466 2466
2467 // Call MakeCurrent 2467 // Call MakeCurrent
2468 ret = _sym_OSMesaMakeCurrent(ctx->context, sfc->buffer, GL_UNSIGNED_BYTE, 2468 ret = _sym_OSMesaMakeCurrent(ctx->context, sfc->buffer, GL_UNSIGNED_BYTE,
2469 sfc->w, sfc->h); 2469 sfc->w, sfc->h);
2470 2470
2471 if (ret == GL_FALSE) 2471 if (ret == GL_FALSE)
2472 { 2472 {
@@ -2750,7 +2750,6 @@ gl_sym_init(void)
2750 if (!dst) DBG("Symbol not found %s\n", sym); 2750 if (!dst) DBG("Symbol not found %s\n", sym);
2751#define FALLBAK(dst, typ) if (!dst) dst = (typeof(dst))sym_missing; 2751#define FALLBAK(dst, typ) if (!dst) dst = (typeof(dst))sym_missing;
2752 2752
2753
2754 //------------------------------------------------------// 2753 //------------------------------------------------------//
2755 // GLES 2.0 APIs... 2754 // GLES 2.0 APIs...
2756 FINDSYM(_sym_glActiveTexture, "glActiveTexture", glsym_func_void); 2755 FINDSYM(_sym_glActiveTexture, "glActiveTexture", glsym_func_void);
@@ -3622,7 +3621,15 @@ gl_lib_init(void)
3622{ 3621{
3623#ifdef EVAS_GL 3622#ifdef EVAS_GL
3624 // dlopen OSMesa 3623 // dlopen OSMesa
3625 gl_lib_handle = dlopen("libOSMesa.so.1", RTLD_NOW); 3624 gl_lib_handle = dlopen("libOSMesa.so.9", RTLD_NOW);
3625 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so.8", RTLD_NOW);
3626 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so.7", RTLD_NOW);
3627 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so.6", RTLD_NOW);
3628 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so.5", RTLD_NOW);
3629 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so.4", RTLD_NOW);
3630 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so.3", RTLD_NOW);
3631 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so.2", RTLD_NOW);
3632 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so.1", RTLD_NOW);
3626 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so", RTLD_NOW); 3633 if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so", RTLD_NOW);
3627 if (!gl_lib_handle) 3634 if (!gl_lib_handle)
3628 { 3635 {