diff --git a/src/df/core/df_core.c b/src/df/core/df_core.c index 54c1e9c7..222376da 100644 --- a/src/df/core/df_core.c +++ b/src/df/core/df_core.c @@ -5392,7 +5392,7 @@ df_tex2dformat_from_eval_params(E_Eval eval, MD_Node *params) MD_Node *fmt_node = md_child_from_string(params, str8_lit("fmt"), 0); for(EachNonZeroEnumVal(R_Tex2DFormat, fmt)) { - if(str8_match(r_tex2d_kind_display_string_table[fmt], fmt_node->first->string, StringMatchFlag_CaseInsensitive)) + if(str8_match(r_tex2d_format_display_string_table[fmt], fmt_node->first->string, StringMatchFlag_CaseInsensitive)) { result = fmt; break; diff --git a/src/df/gfx/df_views.c b/src/df/gfx/df_views.c index 89d90f56..a2d63a20 100644 --- a/src/df/gfx/df_views.c +++ b/src/df/gfx/df_views.c @@ -8233,11 +8233,7 @@ DF_VIEW_UI_FUNCTION_DEF(Bitmap) Rng2F32 canvas_rect = r2f32p(0, 0, canvas_dim.x, canvas_dim.y); UI_Rect(canvas_rect) { - DF_BitmapCanvasBoxDrawData *draw_data = push_array(ui_build_arena(), DF_BitmapCanvasBoxDrawData, 1); - draw_data->view_center_pos = view_center_pos; - draw_data->zoom = zoom; canvas_box = ui_build_box_from_stringf(UI_BoxFlag_Clip|UI_BoxFlag_Clickable|UI_BoxFlag_Scroll, "bmp_canvas_%p", view); - ui_box_equip_custom_draw(canvas_box, df_bitmap_view_canvas_box_draw, draw_data); } ////////////////////////////// @@ -8278,6 +8274,16 @@ DF_VIEW_UI_FUNCTION_DEF(Bitmap) } } + ////////////////////////////// + //- rjf: equip canvas draw info + // + { + DF_BitmapCanvasBoxDrawData *draw_data = push_array(ui_build_arena(), DF_BitmapCanvasBoxDrawData, 1); + draw_data->view_center_pos = view_center_pos; + draw_data->zoom = zoom; + ui_box_equip_custom_draw(canvas_box, df_bitmap_view_canvas_box_draw, draw_data); + } + ////////////////////////////// //- rjf: calculate image coordinates // diff --git a/src/render/generated/render.meta.c b/src/render/generated/render.meta.c index 148cdee2..242d8de6 100644 --- a/src/render/generated/render.meta.c +++ b/src/render/generated/render.meta.c @@ -30,9 +30,11 @@ U8 r_tex2d_format_bytes_per_pixel_table[9] = 16, }; -String8 r_tex2d_kind_display_string_table[1] = +String8 r_resource_kind_display_string_table[3] = { -str8_lit_comp("$(a.display_string)"), +str8_lit_comp("Static"), +str8_lit_comp("Dynamic"), +str8_lit_comp("Stream "), }; String8 r_tex2d_sample_kind_display_string_table[2] = diff --git a/src/render/generated/render.meta.h b/src/render/generated/render.meta.h index 80a255e0..5fad100c 100644 --- a/src/render/generated/render.meta.h +++ b/src/render/generated/render.meta.h @@ -55,7 +55,7 @@ R_PassKind_COUNT, C_LINKAGE_BEGIN extern String8 r_tex2d_format_display_string_table[9]; extern U8 r_tex2d_format_bytes_per_pixel_table[9]; -extern String8 r_tex2d_kind_display_string_table[1]; +extern String8 r_resource_kind_display_string_table[3]; extern String8 r_tex2d_sample_kind_display_string_table[2]; extern String8 r_pass_kind_display_string_table[3]; extern U8 r_pass_kind_batch_table[3]; diff --git a/src/render/render_core.mdesk b/src/render/render_core.mdesk index 1dac3c65..c892a9b0 100644 --- a/src/render/render_core.mdesk +++ b/src/render/render_core.mdesk @@ -26,12 +26,12 @@ R_ResourceKindTable: // GPU can read the resource // CPU is not allowed to read or write {Static "Static" } - + // dynamic resource allows resource to be modified // GPU can read & write to it // CPU can write to it using UpdateSubresource {Dynamic "Dynamic"} - + // stream resource will be often updated fully overwriting previous data // GPU can only read it // CPU can update via Map (with WRITE_DISCARD flag) + Unmap @@ -105,9 +105,9 @@ R_PassKindTable: @expand(R_Tex2DFormatTable a) `$(a.bytes_per_pixel)`; } -@data(String8) r_tex2d_kind_display_string_table: +@data(String8) r_resource_kind_display_string_table: { - @expand(R_Tex2DKindTable a) `str8_lit_comp("$(a.display_string)")`; + @expand(R_ResourceKindTable a) `str8_lit_comp("$(a.display_string)")`; } @data(String8) r_tex2d_sample_kind_display_string_table: