diff options
| author | byungchul.so <byungchul.so@samsung.com> | 2022-07-06 12:44:21 +0900 |
|---|---|---|
| committer | byungchul.so <byungchul.so@samsung.com> | 2022-07-06 19:09:37 +0900 |
| commit | 5e6045b893cc337da60d320dfd37777027d4a8c5 (patch) | |
| tree | 251772208f62ad3ec5252bb113edb7c350ed9cde | |
| parent | e5cd1eebcaca37b515e6cb52111730d08587e5a2 (diff) | |
| download | emulator-yagl-5e6045b893cc337da60d320dfd37777027d4a8c5.tar.gz emulator-yagl-5e6045b893cc337da60d320dfd37777027d4a8c5.tar.bz2 emulator-yagl-5e6045b893cc337da60d320dfd37777027d4a8c5.zip | |
yagl_glsl_parser: parsing '#if !defined()' block correctlytizen_7.0_m2_releasesubmit/tizen/20220707.002536accepted/tizen/unified/20220707.133343accepted/tizen/7.0/unified/hotfix/20221116.104403accepted/tizen/7.0/unified/20221110.062127tizen_7.0_hotfixtizen_7.0accepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unified
- 'state->pp_current_expr > 0' is added to ensure always 'token' is put on the top of expression stack.
- Increase the priority of yagl_glsl_pp_op_defined to ensure yagl_glsl_pp_op_defined is ahead of yagl_glsl_pp_op_not
- With this patch, #if !defined(TOKEN) is parsed from ['not', 'token', 'defined'] to ['token', 'defined', 'not'].
Change-Id: I8298c9cb2f36dd5412dde270deeaf2101bc5087d
| -rw-r--r-- | GLESv2/yagl_glsl_state.c | 6 | ||||
| -rw-r--r-- | packaging/emulator-yagl.spec | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/GLESv2/yagl_glsl_state.c b/GLESv2/yagl_glsl_state.c index a60785d..a9a74db 100644 --- a/GLESv2/yagl_glsl_state.c +++ b/GLESv2/yagl_glsl_state.c @@ -67,7 +67,7 @@ const int glsl_pp_op_prio[] = { 11, // yagl_glsl_pp_op_bit_not 11, // yagl_glsl_pp_op_negative 11, // yagl_glsl_pp_op_positive - 11, // yagl_glsl_pp_op_defined + 12, // yagl_glsl_pp_op_defined 0, // yagl_glsl_pp_op_par_open - lowest priority because of special handling 0, // yagl_glsl_pp_op_par_close - lowest priority because of special handling }; @@ -665,7 +665,7 @@ void yagl_glsl_state_pp_condition_parse_add_op(struct yagl_glsl_state *state, ya } // move higher or equal priority operations to expression stack - while (state->pp_current_op > 0 && + while (state->pp_current_op > 0 && state->pp_current_expr > 0 && glsl_pp_op_prio[op] <= glsl_pp_op_prio[state->pp_ops[state->pp_current_op - 1]]) { assert(state->pp_current_expr < YAGL_GLSL_PP_EXPRESSION_STACK_SIZE); state->pp_current_op--; @@ -834,7 +834,7 @@ yagl_glsl_pp_condition_status yagl_glsl_state_pp_condition_resolve(struct yagl_g assert(state->pp_condition_parse_started); // empty op stack into expression stack - while (state->pp_current_op > 0) { + while (state->pp_current_op > 0 && state->pp_current_expr > 0) { assert(state->pp_current_expr < YAGL_GLSL_PP_EXPRESSION_STACK_SIZE); state->pp_current_op--; state->pp_exprs[state->pp_current_expr].op = state->pp_ops[state->pp_current_op]; diff --git a/packaging/emulator-yagl.spec b/packaging/emulator-yagl.spec index 4cf9804..ab5e2c3 100644 --- a/packaging/emulator-yagl.spec +++ b/packaging/emulator-yagl.spec @@ -6,7 +6,7 @@ Name: emulator-yagl Summary: YaGL - OpenGLES acceleration module for emulator Version: 1.6 -Release: 3 +Release: 4 License: MIT and LGPL-3.0+ Group: SDK/Libraries Source0: %{name}-%{version}.tar.gz |