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