summaryrefslogtreecommitdiff
path: root/src/examples/evas
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-03-26 10:09:42 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-03-26 10:09:42 -0400
commit17e60a55851c8d37ccd8cabb5757a9c0f59e2930 (patch)
treed6cf0c1ac20a7e51ff8c572dac9b779e16e8986e /src/examples/evas
parent2e545ee34e58d4bd2438dd41c29374da7efc232a (diff)
evas_3d: stop just segfaulting straight away
Summary: there have been wrong function calls, that did not work at all, since the function pointer had the wrong type. This fixes the segfaulting examples of evas3d. However, they still do not render, at least, they don't crash anymore. Depends on D8381 Reviewers: cedric, segfaultxavi, zmike, stefan_schmidt Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8382
Diffstat (limited to 'src/examples/evas')
-rw-r--r--src/examples/evas/meson.build4
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-header.h6
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c5
-rw-r--r--src/examples/evas/shooter/meson.build5
4 files changed, 16 insertions, 4 deletions
diff --git a/src/examples/evas/meson.build b/src/examples/evas/meson.build
index c07587dec6..34c8bd3463 100644
--- a/src/examples/evas/meson.build
+++ b/src/examples/evas/meson.build
@@ -51,7 +51,9 @@ examples = [
51] 51]
52 52
53foreach example : examples 53foreach example : examples
54 executable(example, example + '.c', 54 executable(example, example + '.c',
55 dependencies: [eina, ecore_evas, ecore_file, m], 55 dependencies: [eina, ecore_evas, ecore_file, m],
56 c_args : ['-DPACKAGE_EXAMPLES_DIR="'+meson.current_source_dir()+'"']) 56 c_args : ['-DPACKAGE_EXAMPLES_DIR="'+meson.current_source_dir()+'"'])
57endforeach 57endforeach
58
59subdir('shooter')
diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.h b/src/examples/evas/shooter/evas-3d-shooter-header.h
index aaa6ff389c..cd30fde209 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-header.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-header.h
@@ -113,9 +113,9 @@ typedef struct _Scene_Data
113 Eina_Bool normal; 113 Eina_Bool normal;
114} Scene_Data; 114} Scene_Data;
115 115
116static Evas *evas = NULL; 116extern Evas *evas;
117static Eo *background = NULL; 117extern Eo *background;
118static Eo *image = NULL; 118extern Eo *image;
119 119
120static const vec2 tex_scale = {1, 1}; 120static const vec2 tex_scale = {1, 1};
121 121
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index 1c4deb4d7e..2dcad1db61 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -19,6 +19,11 @@
19#define LOCAL_IMAGE_FOLDER PACKAGE_EXAMPLES_DIR "" EVAS_PROJECT_IMAGE_FOLDER 19#define LOCAL_IMAGE_FOLDER PACKAGE_EXAMPLES_DIR "" EVAS_PROJECT_IMAGE_FOLDER
20#define LOCAL_MODEL_FOLDER PACKAGE_EXAMPLES_DIR "" EVAS_PROJECT_MODEL_FOLDER 20#define LOCAL_MODEL_FOLDER PACKAGE_EXAMPLES_DIR "" EVAS_PROJECT_MODEL_FOLDER
21 21
22
23Evas *evas = NULL;
24Eo *background = NULL;
25Eo *image = NULL;
26
22static const char *gray_brick_n_path = LOCAL_IMAGE_FOLDER "/brick-stone_n.jpg"; 27static const char *gray_brick_n_path = LOCAL_IMAGE_FOLDER "/brick-stone_n.jpg";
23static const char *gray_brick_path = LOCAL_IMAGE_FOLDER "/brick-stone.jpg"; 28static const char *gray_brick_path = LOCAL_IMAGE_FOLDER "/brick-stone.jpg";
24static const char *red_brick_n_path = LOCAL_IMAGE_FOLDER "/bricks_n.jpg"; 29static const char *red_brick_n_path = LOCAL_IMAGE_FOLDER "/bricks_n.jpg";
diff --git a/src/examples/evas/shooter/meson.build b/src/examples/evas/shooter/meson.build
new file mode 100644
index 0000000000..abb782d540
--- /dev/null
+++ b/src/examples/evas/shooter/meson.build
@@ -0,0 +1,5 @@
1executable('evas-3d-shooter',
2 ['evas-3d-shooter-header.c', 'evas-3d-shooter.c'],
3 dependencies: [ecore_evas],
4 c_args : ['-DPACKAGE_EXAMPLES_DIR="'+meson.current_source_dir()+'"']
5)