/*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
- * Author: Vladimir Nadvornik
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stdio.h>
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 ());