From d8a860b6050dc3856321fa538cbbafb74650f491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 3 Aug 2023 12:52:25 +0200 Subject: [PATCH] Cleanup: Editors: Remove unused ED_screen_preview_render This was introduced before workspaces were a thing. It isn't used anymore and is easy to bring back if needed. --- source/blender/editors/include/ED_screen.h | 7 ------ .../blender/editors/render/render_preview.cc | 6 ----- source/blender/editors/screen/screen_draw.cc | 23 ------------------- 3 files changed, 36 deletions(-) diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 4fc0ae1d2b3..5e2681f153f 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -394,13 +394,6 @@ ScrArea *ED_screen_area_find_with_spacedata(const bScreen *screen, bool only_visible); struct wmWindow *ED_screen_window_find(const struct bScreen *screen, const struct wmWindowManager *wm); -/** - * Render the preview for a screen layout in \a screen. - */ -void ED_screen_preview_render(const struct bScreen *screen, - int size_x, - int size_y, - unsigned int *r_rect) ATTR_NONNULL(); /* workspaces */ diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index e099d3b4da6..9f2691aa619 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -1454,12 +1454,6 @@ static void icon_preview_startjob(void *customdata, bool *stop, bool *do_update) *do_update = true; } - else if (idtype == ID_SCR) { - bScreen *screen = (bScreen *)id; - - ED_screen_preview_render(screen, sp->sizex, sp->sizey, sp->pr_rect); - *do_update = true; - } else { /* re-use shader job */ shader_preview_startjob(customdata, stop, do_update); diff --git a/source/blender/editors/screen/screen_draw.cc b/source/blender/editors/screen/screen_draw.cc index 2ce42994f9d..6f332512d90 100644 --- a/source/blender/editors/screen/screen_draw.cc +++ b/source/blender/editors/screen/screen_draw.cc @@ -422,26 +422,3 @@ static void screen_preview_draw(const bScreen *screen, int size_x, int size_y) GPU_matrix_pop(); } - -void ED_screen_preview_render(const bScreen *screen, int size_x, int size_y, uint *r_rect) -{ - char err_out[256] = "unknown"; - GPUOffScreen *offscreen = GPU_offscreen_create(size_x, - size_y, - true, - GPU_RGBA8, - GPU_TEXTURE_USAGE_SHADER_READ | - GPU_TEXTURE_USAGE_HOST_READ, - err_out); - - GPU_offscreen_bind(offscreen, true); - GPU_clear_color(0.0f, 0.0f, 0.0f, 0.0f); - GPU_clear_depth(1.0f); - - screen_preview_draw(screen, size_x, size_y); - - GPU_offscreen_read_color(offscreen, GPU_DATA_UBYTE, r_rect); - GPU_offscreen_unbind(offscreen, true); - - GPU_offscreen_free(offscreen); -}