Mercurial > hg > forks > geeqie
changeset 2288:82c1b1761856
Update for new cogl version
Parameters for cogl_texture_3d_new_from_data have changed.
| author | Colin Clark <cclark@mcb.net> |
|---|---|
| date | Tue, 29 Mar 2016 18:18:05 +0100 |
| parents | c37ce63e3c87 |
| children | 0b284a48ac34 |
| files | src/renderer-clutter.c |
| diffstat | 1 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/renderer-clutter.c Thu Mar 10 21:36:58 2016 +0100 +++ b/src/renderer-clutter.c Tue Mar 29 18:18:05 2016 +0100 @@ -234,7 +234,19 @@ g_object_unref(tmp_pixbuf); DEBUG_0("%s clut upload start", get_exec_time()); -#if CLUTTER_CHECK_VERSION(1,10,0) +#if COGL_VERSION_CHECK(1,18,2) + { + CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ()); + + tex3d = cogl_texture_3d_new_from_data(ctx, + CLUT_SIZE, CLUT_SIZE, CLUT_SIZE, + COGL_PIXEL_FORMAT_RGB_888, + CLUT_SIZE * 3, + CLUT_SIZE * CLUT_SIZE * 3, + clut, + NULL); + } +#elif COGL_VERSION_CHECK(1,10,4) { CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ());