diff --git a/src/dbg_engine/dbg_engine_core.c b/src/dbg_engine/dbg_engine_core.c index 2d096a35..a3f72a26 100644 --- a/src/dbg_engine/dbg_engine_core.c +++ b/src/dbg_engine/dbg_engine_core.c @@ -727,6 +727,7 @@ d_symbol_name_from_dbgi_key_voff(Arena *arena, DI_Key *dbgi_key, U64 voff, U64 d if(decorated && inline_site->type_idx != 0) { String8List list = {0}; + str8_list_pushf(scratch.arena, &list, "[inlined] "); e_type_lhs_string_from_key(scratch.arena, type, &list, 0, 0); str8_list_push(scratch.arena, &list, name); e_type_rhs_string_from_key(scratch.arena, type, &list, 0); diff --git a/src/eval/eval_parse.c b/src/eval/eval_parse.c index 13ea164b..e6509523 100644 --- a/src/eval/eval_parse.c +++ b/src/eval/eval_parse.c @@ -2090,10 +2090,7 @@ e_parse_expr_from_text_tokens__prec(Arena *arena, String8 text, E_TokenArray *to // rjf: parse all argument expressions E_Expr *callee_expr = atom; E_Expr *call_expr = e_push_expr(arena, E_ExprKind_Call, token_string.str); - if(callee_expr->kind == E_ExprKind_LeafIdent) - { - call_expr->string = callee_expr->string; - } + call_expr->string = callee_expr->string; e_expr_push_child(call_expr, callee_expr); E_TokenArray args_parse_tokens = e_token_array_make_first_opl(it, it_opl); E_Parse args_parse = e_parse_expr_from_text_tokens__prec(arena, text, &args_parse_tokens, e_max_precedence, max_U64); diff --git a/src/raddbg/raddbg_views.c b/src/raddbg/raddbg_views.c index 5df53e09..b37ea013 100644 --- a/src/raddbg/raddbg_views.c +++ b/src/raddbg/raddbg_views.c @@ -1286,14 +1286,6 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla result.eval = e_eval_from_expr(scratch.arena, root_expr); result.string = rd_value_string_from_eval(arena, string_flags, 10, font, font_size, max_size_px, result.eval); result.can_edit = (ev_type_key_is_editable(result.eval.type_key) && result.eval.mode == E_Mode_Offset); - - //- rjf: determine if inlined - E_Type *type = e_type_from_key__cached(result.eval.type_key); - if(type->depth > 0) - { - result.is_inlined = 1; - } - scratch_end(scratch); }break; diff --git a/src/raddbg/raddbg_views.h b/src/raddbg/raddbg_views.h index 43d040b1..b017a4f8 100644 --- a/src/raddbg/raddbg_views.h +++ b/src/raddbg/raddbg_views.h @@ -97,7 +97,6 @@ struct RD_WatchRowCellInfo B32 is_button; B32 can_edit; B32 is_errored; - B32 is_inlined; String8 error_tooltip; String8 inheritance_tooltip; RD_ViewUIRule *view_ui_rule; diff --git a/src/render/d3d11/render_d3d11.c b/src/render/d3d11/render_d3d11.c index dc5cb244..20e5ab91 100644 --- a/src/render/d3d11/render_d3d11.c +++ b/src/render/d3d11/render_d3d11.c @@ -826,8 +826,10 @@ r_end_frame(void) tex = next) { next = tex->next; - tex->view->lpVtbl->Release(tex->view); - tex->texture->lpVtbl->Release(tex->texture); + tex->view->lpVtbl->Release(tex->view); + tex->texture->lpVtbl->Release(tex->texture); + tex->view = 0; + tex->texture = 0; tex->generation += 1; SLLStackPush(r_d3d11_state->first_free_tex2d, tex); }