X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbin%2Ftest_glview.c;h=ecade555817a0b5e2538f832817c609731481538;hb=9d446c30b60c3d6661b641aa6f04b4a8f3752c0d;hp=0919d17acb2e3dfb192da32922b52d80999d416f;hpb=8b97ea4ed65f1ade7e5b18b38389ff8223cb4164;p=framework%2Fuifw%2Felementary.git diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c index 0919d17..ecade55 100644 --- a/src/bin/test_glview.c +++ b/src/bin/test_glview.c @@ -326,7 +326,9 @@ static const char vertex_shader[] = "}\n"; static const char fragment_shader[] = + "#ifdef GL_ES\n" "precision mediump float;\n" + "#endif\n" "uniform vec4 color;\n" "uniform vec3 light;\n" "varying vec3 rotated_normal;\n" @@ -339,7 +341,6 @@ static const char vertex_shader[] = " gl_FragColor = color + white * dot(light_direction, rotated_normal);\n" "}\n"; - static void gears_init(GLData *gld) { @@ -386,7 +387,6 @@ gears_init(GLData *gld) gld->gear3 = make_gear(gld, 1.3, 2.0, 0.5, 10, 0.7); } - static void gldata_init(GLData *gld) { @@ -440,7 +440,6 @@ _del_gl(Evas_Object *obj) free(gld); } - static void _resize_gl(Evas_Object *obj) { @@ -454,8 +453,6 @@ _resize_gl(Evas_Object *obj) gears_reshape(gld, w,h); } - - static void _draw_gl(Evas_Object *obj) { @@ -480,7 +477,6 @@ _on_done(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) evas_object_del((Evas_Object*)data); } - static void _del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { @@ -488,7 +484,6 @@ _del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event ecore_animator_del(ani); } - static void _key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) { @@ -559,7 +554,6 @@ _mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *eve gld->mouse_down = 0; } - void test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -576,7 +570,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_title_set(win, "GLView"); elm_win_autodel_set(win, EINA_TRUE); - // add a standard bg bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -598,7 +591,7 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_glview_init_func_set(gl, _init_gl); elm_glview_del_func_set(gl, _del_gl); elm_glview_resize_func_set(gl, _resize_gl); - elm_glview_render_func_set(gl, (Elm_GLView_Func)_draw_gl); + elm_glview_render_func_set(gl, (Elm_GLView_Func_Cb)_draw_gl); elm_box_pack_end(bx, gl); evas_object_show(gl); @@ -609,7 +602,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_UP, _mouse_up, gl); evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, gl); - // Animator and other vars ani = ecore_animator_add(_anim, gl); gld->glapi = elm_glview_gl_api_get(gl); @@ -617,7 +609,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_data_set(gl, "gld", gld); evas_object_event_callback_add(gl, EVAS_CALLBACK_DEL, _del, gl); - /* add an ok button */ bt = elm_button_add(win); elm_object_text_set(bt, "OK");