summarylogtreecommitdiffstats
path: root/nvidia.patch
blob: b2c3078e0d8f7e803f4b129b688a673118ecb044 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
Submodule subprojects/wlroots contains modified content
diff --git a/subprojects/wlroots/render/gles2/renderer.c b/subprojects/wlroots/render/gles2/renderer.c
index 9fe934f7..9662d4ee 100644
--- render/gles2/renderer.c
+++ render/gles2/renderer.c
@@ -176,7 +176,7 @@ static bool gles2_bind_buffer(struct wlr_renderer *wlr_renderer,
 		assert(wlr_egl_is_current(renderer->egl));
 
 		push_gles2_debug(renderer);
-		glFlush();
+		glFinish();
 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
 		pop_gles2_debug(renderer);
 
diff --git a/subprojects/wlroots/types/output/render.c b/subprojects/wlroots/types/output/render.c
index a185d844..01df6ffc 100644
--- types/output/render.c
+++ types/output/render.c
@@ -240,22 +240,7 @@ bool output_pick_format(struct wlr_output *output,
 }
 
 uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
-	struct wlr_renderer *renderer = output->renderer;
-	assert(renderer != NULL);
-
-	if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
-		return DRM_FORMAT_INVALID;
-	}
-
-	if (!wlr_output_attach_render(output, NULL)) {
-		return false;
-	}
-
-	uint32_t fmt = renderer->impl->preferred_read_format(renderer);
-
-	output_clear_back_buffer(output);
-
-	return fmt;
+	return DRM_FORMAT_XRGB8888;
 }
 
 struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,