diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/evas/include/evas_private.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index af2592bc1a..427a71de0d 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h | |||
@@ -369,9 +369,11 @@ struct _Evas_3D_Texture | |||
369 | Evas_Object *source; | 369 | Evas_Object *source; |
370 | Eina_Bool proxy_rendering; | 370 | Eina_Bool proxy_rendering; |
371 | void *proxy_surface; | 371 | void *proxy_surface; |
372 | |||
373 | /* Engine-side object. */ | 372 | /* Engine-side object. */ |
374 | void *engine_data; | 373 | void *engine_data; |
374 | |||
375 | /*Use atlases, @EINA_TRUE by default*/ | ||
376 | Eina_Bool atlas_enable :1; | ||
375 | }; | 377 | }; |
376 | 378 | ||
377 | struct _Evas_3D_Material | 379 | struct _Evas_3D_Material |
@@ -389,7 +391,7 @@ struct _Evas_3D_Material | |||
389 | 391 | ||
390 | struct _Evas_3D_Scene_Public_Data | 392 | struct _Evas_3D_Scene_Public_Data |
391 | { | 393 | { |
392 | Evas_Color bg_color; | 394 | Evas_Color bg_color; |
393 | Evas_3D_Node *camera_node; | 395 | Evas_3D_Node *camera_node; |
394 | Eina_List *light_nodes; | 396 | Eina_List *light_nodes; |
395 | Eina_List *mesh_nodes; | 397 | Eina_List *mesh_nodes; |
@@ -1360,17 +1362,15 @@ struct _Evas_Func | |||
1360 | int (*drawable_texture_color_pick_id_get) (void *drawable); | 1362 | int (*drawable_texture_color_pick_id_get) (void *drawable); |
1361 | double (*drawable_texture_pixel_color_get) (unsigned int tex EINA_UNUSED, int x, int y, void *drawable); | 1363 | double (*drawable_texture_pixel_color_get) (unsigned int tex EINA_UNUSED, int x, int y, void *drawable); |
1362 | 1364 | ||
1363 | void *(*texture_new) (void *data); | 1365 | void *(*texture_new) (void *data, Eina_Bool use_atlas); |
1364 | void (*texture_free) (void *data, void *texture); | 1366 | void (*texture_free) (void *data, void *texture); |
1365 | void (*texture_data_set) (void *data, void *texture, Evas_3D_Color_Format format, Evas_3D_Pixel_Format pixel_format, int w, int h, const void *pixels); | ||
1366 | void (*texture_file_set) (void *data, void *texture, const char *file, const char *key); | ||
1367 | void (*texture_color_format_get) (void *data, void *texture, Evas_3D_Color_Format *format); | ||
1368 | void (*texture_size_get) (void *data, void *texture, int *w, int *h); | 1367 | void (*texture_size_get) (void *data, void *texture, int *w, int *h); |
1369 | void (*texture_wrap_set) (void *data, void *texture, Evas_3D_Wrap_Mode s, Evas_3D_Wrap_Mode t); | 1368 | void (*texture_wrap_set) (void *data, void *texture, Evas_3D_Wrap_Mode s, Evas_3D_Wrap_Mode t); |
1370 | void (*texture_wrap_get) (void *data, void *texture, Evas_3D_Wrap_Mode *s, Evas_3D_Wrap_Mode *t); | 1369 | void (*texture_wrap_get) (void *data, void *texture, Evas_3D_Wrap_Mode *s, Evas_3D_Wrap_Mode *t); |
1371 | void (*texture_filter_set) (void *data, void *texture, Evas_3D_Texture_Filter min, Evas_3D_Texture_Filter mag); | 1370 | void (*texture_filter_set) (void *data, void *texture, Evas_3D_Texture_Filter min, Evas_3D_Texture_Filter mag); |
1372 | void (*texture_filter_get) (void *data, void *texture, Evas_3D_Texture_Filter *min, Evas_3D_Texture_Filter *mag); | 1371 | void (*texture_filter_get) (void *data, void *texture, Evas_3D_Texture_Filter *min, Evas_3D_Texture_Filter *mag); |
1373 | void (*texture_image_set) (void *data, void *texture, void *image); | 1372 | void (*texture_image_set) (void *data, void *texture, void *image); |
1373 | void *(*texture_image_get) (void *data, void *texture); | ||
1374 | 1374 | ||
1375 | Ector_Surface *(*ector_get) (void *data); | 1375 | Ector_Surface *(*ector_get) (void *data); |
1376 | void (*ector_begin) (void *data, void *context, void *surface, int x, int y, Eina_Bool do_async); | 1376 | void (*ector_begin) (void *data, void *context, void *surface, int x, int y, Eina_Bool do_async); |