GUACAMOLE-377: Remove unnecessary locking of last frame during resize.

No longer necessary now that the last and pending frame buffers are not interleaved.
apache · Sep 18, 2024 · f508677 · f508677
1 parent 921b620
commit f508677
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/libguac/display-layer-list.c b/src/libguac/display-layer-list.c
@@ -368,7 +368,7 @@ void guac_display_remove_layer(guac_display_layer* display_layer) {
 
 }
 
-void PFW_LFW_guac_display_layer_resize(guac_display_layer* layer, int width, int height) {
+void PFW_guac_display_layer_resize(guac_display_layer* layer, int width, int height) {
 
     /* Flush and destroy any cached Cairo context */
     guac_display_layer_cairo_context* cairo_context = &(layer->pending_frame_cairo_context);

diff --git a/src/libguac/display-layer.c b/src/libguac/display-layer.c
@@ -137,12 +137,10 @@ void guac_display_layer_resize(guac_display_layer* layer, int width, int height)
 
     guac_display* display = layer->display;
     guac_rwlock_acquire_write_lock(&display->pending_frame.lock);
-    guac_rwlock_acquire_write_lock(&display->last_frame.lock);
 
-    PFW_LFW_guac_display_layer_resize(layer, width, height);
+    PFW_guac_display_layer_resize(layer, width, height);
     PFW_guac_display_layer_touch(layer);
 
-    guac_rwlock_release_lock(&display->last_frame.lock);
     guac_rwlock_release_lock(&display->pending_frame.lock);
 
 }

diff --git a/src/libguac/display-priv.h b/src/libguac/display-priv.h
@@ -754,7 +754,7 @@ void guac_display_remove_layer(guac_display_layer* display_layer);
  * @param height
  *     The new height, in pixels.
  */
-void PFW_LFW_guac_display_layer_resize(guac_display_layer* layer,
+void PFW_guac_display_layer_resize(guac_display_layer* layer,
         int width, int height);
 
 /**