summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Song <henry.song@samsung.com>2015-07-24 13:59:44 -0700
committernisanthmp <nisanth.mp@samsung.com>2015-08-03 18:48:33 +0530
commita9838c25d1d3e99e802b1fd5882ae74171e7df41 (patch)
tree7f3a80154a457f02ccad1f65a282f4257829ede9
parentf39f841f012538d8702a7e9c4d2a9d4b22fb1716 (diff)
downloadcairo-a9838c25d1d3e99e802b1fd5882ae74171e7df41.tar.gz
cairo-a9838c25d1d3e99e802b1fd5882ae74171e7df41.tar.bz2
cairo-a9838c25d1d3e99e802b1fd5882ae74171e7df41.zip
gl: set default VBO size 256K
Set default VBO size to be 256K, previous 1M is too big to be handled on at least intel driver with GL context <= 3.0 Set both egl and evasgl vbo size to be 16K Change-Id: I7fd504ec47523dbe8ae85f08f3798f1a10879161 Signed-off-by: nisanthmp <nisanth.mp@samsung.com>
-rw-r--r--src/cairo-egl-context.c2
-rw-r--r--src/cairo-evas-gl-context.c3
-rw-r--r--src/cairo-gl-private.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/cairo-egl-context.c b/src/cairo-egl-context.c
index 5b67d4b3c..0a13c6aac 100644
--- a/src/cairo-egl-context.c
+++ b/src/cairo-egl-context.c
@@ -343,7 +343,7 @@ cairo_egl_device_create (EGLDisplay dpy, EGLContext egl)
* This smaller size means that flushing needs to be done more often,
* but it is less demanding of scarce memory on embedded devices.
*/
- ctx->base.vbo_size = 16*1024;
+ ctx->base.vbo_size = 16 * 1024;
eglMakeCurrent (dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
diff --git a/src/cairo-evas-gl-context.c b/src/cairo-evas-gl-context.c
index 3cd4e0e0b..8135edacb 100644
--- a/src/cairo-evas-gl-context.c
+++ b/src/cairo-evas-gl-context.c
@@ -337,6 +337,9 @@ cairo_evas_gl_device_create (Evas_GL *evas_gl,
else
ctx->has_multithread_makecurrent = FALSE;
+ // reset vbo_size
+ ctx->base.vbo_size = 16 * 1024;
+
evas_gl_make_current (ctx->evas_gl, NULL, NULL);
return &ctx->base.base;
}
diff --git a/src/cairo-gl-private.h b/src/cairo-gl-private.h
index ad08abd9f..e5a709e97 100644
--- a/src/cairo-gl-private.h
+++ b/src/cairo-gl-private.h
@@ -112,7 +112,7 @@
* but larger means hogging more memory and can cause trouble for drivers
* (especially on embedded devices). Use the CAIRO_GL_VBO_SIZE environment
* variable to set this to a different size. */
-#define CAIRO_GL_VBO_SIZE_DEFAULT (1024*1024)
+#define CAIRO_GL_VBO_SIZE_DEFAULT (256*1024)
#define MIN_IMAGE_CACHE_WIDTH 512
#define MIN_IMAGE_CACHE_HEIGHT 512