mirror of
				https://gitlab.freedesktop.org/wlroots/wlroots.git
				synced 2025-11-03 09:01:40 -05:00 
			
		
		
		
	scene: use wlr_output_state for direct scanout
Avoids polluting wlr_output.pending with temporary state. Removes the need to call wlr_output_rollback() in error codepaths.
This commit is contained in:
		
							parent
							
								
									c02872e033
								
							
						
					
					
						commit
						ce089498cc
					
				
					 1 changed files with 7 additions and 4 deletions
				
			
		| 
						 | 
					@ -1424,13 +1424,16 @@ static bool scene_node_try_direct_scanout(struct wlr_scene_node *node,
 | 
				
			||||||
		return false;
 | 
							return false;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	wlr_output_attach_buffer(output, buffer->buffer);
 | 
						struct wlr_output_state state = {
 | 
				
			||||||
	if (!wlr_output_test(output)) {
 | 
							.committed = WLR_OUTPUT_STATE_BUFFER,
 | 
				
			||||||
		wlr_output_rollback(output);
 | 
							.buffer = buffer->buffer,
 | 
				
			||||||
 | 
						};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (!wlr_output_test_state(output, &state)) {
 | 
				
			||||||
		return false;
 | 
							return false;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return wlr_output_commit(output);
 | 
						return wlr_output_commit_state(output, &state);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool wlr_scene_output_commit(struct wlr_scene_output *scene_output) {
 | 
					bool wlr_scene_output_commit(struct wlr_scene_output *scene_output) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue