aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-06-03 10:31:19 +0100
committerLibravatar GitHub <noreply@github.com>2018-06-03 10:31:19 +0100
commitebe0b668c9749dcd857f2b6b248b3f6cb3322b8f (patch)
tree0b961fa02ca285884d7661f223ae9422408bbcb0
parentMerge pull request #2096 from kupospelov/fix-title-update (diff)
parentAdd SWAY_DAMAGE_DEBUG (diff)
downloadsway-ebe0b668c9749dcd857f2b6b248b3f6cb3322b8f.tar.gz
sway-ebe0b668c9749dcd857f2b6b248b3f6cb3322b8f.tar.zst
sway-ebe0b668c9749dcd857f2b6b248b3f6cb3322b8f.zip
Merge pull request #2093 from emersion/damage-debug
Add SWAY_DAMAGE_DEBUG
-rw-r--r--sway/desktop/output.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 964cfe00..3fa586d0 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -846,11 +846,24 @@ static void render_output(struct sway_output *output, struct timespec *when,
846 846
847 wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height); 847 wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
848 848
849 bool damage_whole_before_swap = false;
849 if (!pixman_region32_not_empty(damage)) { 850 if (!pixman_region32_not_empty(damage)) {
850 // Output isn't damaged but needs buffer swap 851 // Output isn't damaged but needs buffer swap
851 goto renderer_end; 852 goto renderer_end;
852 } 853 }
853 854
855 const char *damage_debug = getenv("SWAY_DAMAGE_DEBUG");
856 if (damage_debug != NULL) {
857 if (strcmp(damage_debug, "highlight") == 0) {
858 wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
859 damage_whole_before_swap = true;
860 } else if (strcmp(damage_debug, "rerender") == 0) {
861 int width, height;
862 wlr_output_transformed_resolution(wlr_output, &width, &height);
863 pixman_region32_union_rect(damage, damage, 0, 0, width, height);
864 }
865 }
866
854 struct sway_container *workspace = output_get_active_workspace(output); 867 struct sway_container *workspace = output_get_active_workspace(output);
855 868
856 if (workspace->sway_workspace->fullscreen) { 869 if (workspace->sway_workspace->fullscreen) {
@@ -905,6 +918,12 @@ renderer_end:
905 wlr_output->transform_matrix, 0, 0, 1); 918 wlr_output->transform_matrix, 0, 0, 1);
906 } 919 }
907 920
921 if (damage_whole_before_swap || root_container.sway_root->debug_tree) {
922 int width, height;
923 wlr_output_transformed_resolution(wlr_output, &width, &height);
924 pixman_region32_union_rect(damage, damage, 0, 0, width, height);
925 }
926
908 wlr_renderer_scissor(renderer, NULL); 927 wlr_renderer_scissor(renderer, NULL);
909 wlr_renderer_end(renderer); 928 wlr_renderer_end(renderer);
910 if (!wlr_output_damage_swap_buffers(output->damage, when, damage)) { 929 if (!wlr_output_damage_swap_buffers(output->damage, when, damage)) {