Robert Bragg
6f480c7530
texture: remove _cogl_texture_prepare_for_upload
...
This removes the gl centric _cogl_texture_prepare_for_upload api from
cogl-texture.c and instead adds a _cogl_bitmap_convert_for_upload() api
which everything now uses instead. GL specific code that needed the gl
internal/format/type enums returned by _cogl_texture_prepare_for_upload
now use ->pixel_format_to_gl directly.
Since there was a special case optimization in
cogl_texture_new_from_file that aimed to avoid copying the temporary
bitmap that's created for the given file and allow conversions to
happen in-place the new _cogl_bitmap_convert_for_upload() api supports
converting in place depending on a 'can_convert_in_place' argument.
This ability to convert bitmaps in-place has been integrated across the
different components as appropriate.
In updating cogl-texture-2d-sliced.c this was able to remove a number of
other GL specific parts to how spans are setup.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit e190dd23c655da34b9c5c263a9f6006dcc0413b0)
Conflicts:
cogl/cogl-auto-texture.c
cogl/cogl.symbols
2013-07-29 16:31:44 +01:00
..
2013-07-29 16:31:44 +01:00
2013-05-29 19:30:44 +01:00
2013-02-20 14:55:44 +00:00
2013-07-11 14:22:12 +01:00
2013-04-24 22:23:50 +01:00
2013-01-22 17:47:39 +00:00
2013-04-24 22:23:50 +01:00
2011-09-09 15:06:31 +01:00
2013-01-22 17:48:18 +00:00
2013-01-22 17:48:05 +00:00
2011-05-06 12:12:08 +01:00
2011-09-09 15:06:31 +01:00
2013-07-29 16:31:44 +01:00
2013-07-29 16:31:44 +01:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:07 +00:00
2011-05-16 14:31:31 +01:00
2013-01-22 17:48:07 +00:00
2013-01-22 17:48:07 +00:00
2013-06-07 16:53:29 +01:00
2013-06-07 16:53:29 +01:00
2013-06-07 16:53:29 +01:00
2013-07-29 16:31:44 +01:00
2013-07-29 16:31:44 +01:00
2013-01-22 18:00:11 +00:00
2013-04-04 13:37:51 +01:00
2013-07-29 16:31:44 +01:00
2013-03-06 16:44:52 +00:00
2013-01-22 17:48:16 +00:00
2013-06-06 21:45:11 +01:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:47:39 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:08 +00:00
2013-01-22 17:48:17 +00:00
2012-08-06 14:27:45 +01:00
2013-01-22 17:48:07 +00:00
2013-03-06 16:46:03 +00:00
2013-01-22 17:48:16 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:19 +00:00
2011-12-06 18:51:57 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:05 +00:00
2013-06-13 13:45:47 +01:00
2013-06-13 13:45:47 +01:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:01 +00:00
2013-04-24 22:23:50 +01:00
2012-08-06 14:27:39 +01:00
2013-07-09 22:52:49 +01:00
2013-07-09 22:52:49 +01:00
2012-08-06 18:51:33 +01:00
2013-01-22 17:47:24 +00:00
2013-06-13 13:45:47 +01:00
2013-07-29 16:06:37 +01:00
2013-06-07 16:53:29 +01:00
2012-08-06 14:27:40 +01:00
2013-05-29 19:30:44 +01:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:05 +00:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2010-03-01 12:56:10 +00:00
2011-05-16 18:45:51 +01:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:15 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:13 +00:00
2013-07-29 16:31:44 +01:00
2012-08-06 18:51:32 +01:00
2013-01-22 17:48:05 +00:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:16 +00:00
2013-01-22 17:48:08 +00:00
2013-06-27 14:29:51 +01:00
2013-05-29 11:58:48 +01:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:13 +00:00
2013-01-22 17:48:01 +00:00
2013-01-22 17:48:17 +00:00
2013-06-13 13:45:47 +01:00
2013-06-13 13:45:47 +01:00
2013-05-28 21:36:03 +01:00
2013-07-04 11:40:40 +01:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:05 +00:00
2013-01-30 20:09:49 +00:00
2013-01-30 20:09:49 +00:00
2013-01-30 20:09:49 +00:00
2013-05-30 13:42:11 +01:00
2013-05-30 13:42:56 +01:00
2013-01-22 17:48:18 +00:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2013-06-13 13:45:47 +01:00
2013-06-13 13:45:47 +01:00
2013-01-08 14:56:25 +01:00
2013-01-22 17:48:13 +00:00
2013-04-30 16:39:31 +01:00
2013-04-30 16:39:31 +01:00
2013-06-07 16:53:29 +01:00
2013-01-22 17:48:07 +00:00
2013-01-22 17:48:17 +00:00
2013-04-30 16:39:31 +01:00
2013-04-30 16:39:31 +01:00
2012-08-06 14:27:42 +01:00
2013-07-19 13:53:52 +01:00
2012-08-06 14:27:39 +01:00
2013-05-29 19:30:44 +01:00
2011-05-16 14:31:31 +01:00
2013-01-22 17:47:59 +00:00
2013-01-22 17:48:05 +00:00
2011-05-16 14:31:31 +01:00
2013-01-22 17:48:07 +00:00
2013-01-22 17:48:13 +00:00
2013-06-13 13:45:47 +01:00
2013-06-13 13:45:47 +01:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:05 +00:00
2013-06-13 13:45:47 +01:00
2013-06-13 13:45:47 +01:00
2013-07-04 11:40:39 +01:00
2013-01-22 17:48:05 +00:00
2012-08-06 14:27:40 +01:00
2013-01-22 17:47:39 +00:00
2013-04-24 22:23:50 +01:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:19 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:15 +00:00
2013-01-18 17:28:25 +00:00
2013-05-16 15:28:00 +01:00
2013-01-22 17:48:05 +00:00
2013-06-13 13:45:47 +01:00
2013-01-22 20:11:25 +00:00
2013-01-22 17:48:16 +00:00
2013-06-13 13:45:47 +01:00
2013-06-13 13:45:47 +01:00
2012-08-06 14:27:39 +01:00
2012-02-20 23:16:37 +00:00
2013-02-22 16:36:38 +01:00
2013-04-24 22:23:50 +01:00
2013-07-11 14:22:12 +01:00
2011-11-01 12:03:02 +00:00
2012-08-06 14:27:42 +01:00
2013-01-22 17:48:05 +00:00
2013-07-11 14:22:12 +01:00
2013-05-30 13:42:56 +01:00
2013-01-30 19:56:45 +00:00
2013-01-30 19:56:45 +00:00
2013-01-30 19:56:45 +00:00
2011-05-16 13:28:17 +01:00
2013-01-22 17:48:05 +00:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:16 +00:00
2013-06-21 14:18:37 +01:00
2013-01-22 17:48:16 +00:00
2013-06-06 21:49:14 +01:00
2013-04-04 13:38:43 +01:00
2013-04-04 13:38:41 +01:00
2013-04-04 13:38:43 +01:00
2012-08-06 14:27:39 +01:00
2013-06-06 21:27:09 +01:00
2013-01-22 17:48:16 +00:00
2013-06-13 13:45:47 +01:00
2013-06-21 14:18:37 +01:00
2013-06-13 13:45:46 +01:00
2013-06-13 13:45:46 +01:00
2013-06-21 14:18:37 +01:00
2013-06-21 14:18:37 +01:00
2013-06-21 14:18:37 +01:00
2013-07-19 13:54:07 +01:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:07 +00:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:05 +00:00
2012-08-06 14:27:39 +01:00
2013-07-01 13:47:48 +01:00
2013-07-11 14:22:12 +01:00
2013-04-30 16:39:31 +01:00
2013-01-22 17:48:19 +00:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:05 +00:00
2012-09-03 15:51:44 +01:00
2013-01-22 17:48:16 +00:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:05 +00:00
2013-06-07 16:53:29 +01:00
2013-05-29 19:30:44 +01:00
2010-09-14 12:43:17 +01:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:17 +00:00
2011-05-16 14:11:47 +01:00
2013-01-22 17:48:13 +00:00
2013-01-22 17:48:14 +00:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:05 +00:00
2013-07-09 15:46:46 +01:00
2013-07-09 15:46:46 +01:00
2013-01-30 19:57:22 +00:00
2012-08-06 14:27:41 +01:00
2013-01-22 17:48:17 +00:00
2013-06-13 13:45:47 +01:00
2013-01-22 17:48:16 +00:00
2013-01-22 17:48:07 +00:00
2013-01-22 17:48:17 +00:00
2013-04-24 22:23:50 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2013-06-07 16:53:29 +01:00
2013-01-22 17:48:17 +00:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:13 +00:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:05 +00:00
2013-01-22 17:48:05 +00:00
2013-07-29 16:31:44 +01:00
2013-07-29 16:31:44 +01:00
2013-07-29 16:31:44 +01:00
2013-01-22 17:48:17 +00:00
2013-07-29 16:31:44 +01:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:17 +00:00
2013-07-29 16:31:44 +01:00
2013-01-22 17:48:17 +00:00
2013-01-22 17:48:09 +00:00
2013-07-29 16:31:44 +01:00
2013-01-22 17:48:17 +00:00
2013-07-29 16:31:44 +01:00
2013-01-22 17:48:15 +00:00
2013-07-29 16:31:44 +01:00
2013-04-24 22:23:50 +01:00
2013-07-04 11:40:39 +01:00
2012-08-14 18:55:42 +01:00
2013-01-22 17:48:11 +00:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:16 +00:00
2013-04-24 22:23:50 +01:00
2012-08-06 14:27:39 +01:00
2013-01-22 17:48:17 +00:00
2013-04-24 22:23:50 +01:00
2013-01-22 17:48:05 +00:00
2013-07-09 15:46:46 +01:00
2013-07-01 13:48:22 +01:00
2013-05-30 13:41:44 +01:00
2013-05-30 13:41:44 +01:00
2013-01-30 20:09:49 +00:00
2012-02-20 23:12:45 +00:00
2013-04-30 16:39:31 +01:00
2013-05-28 21:36:03 +01:00
2013-01-22 17:48:13 +00:00
2013-01-22 17:48:17 +00:00
2013-04-24 22:23:50 +01:00
2013-06-06 21:27:09 +01:00
2013-05-28 21:36:03 +01:00
2012-08-06 14:27:42 +01:00
2013-05-28 21:36:03 +01:00
2013-06-13 13:45:47 +01:00
2013-01-18 17:28:25 +00:00