From c1f35c3d862f77cbd2fb871be5613fb0ca7e508b Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Mon, 12 Jan 2015 15:29:34 +0100 Subject: [PATCH] glamor: Use GL_FRAMEBUFFER instead of GL_READ_FRAMEBUFFER The latter might not be available on GLES2. Signed-off-by: Maarten Lankhorst Signed-off-by: Eric Anholt Reviewed-by: Eric Anholt --- glamor/glamor_spans.c | 2 +- glamor/glamor_transfer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_spans.c b/glamor/glamor_spans.c index 582d11df3..6ebb12e18 100644 --- a/glamor/glamor_spans.c +++ b/glamor/glamor_spans.c @@ -226,7 +226,7 @@ glamor_get_spans_gl(DrawablePtr drawable, int wmax, BoxPtr box = glamor_pixmap_box_at(pixmap_priv, box_x, box_y); glamor_pixmap_fbo *fbo = glamor_pixmap_fbo_at(pixmap_priv, box_x, box_y); - glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo->fb); + glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb); glPixelStorei(GL_PACK_ALIGNMENT, 4); d = dst; diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c index c920435a6..aa5e8616e 100644 --- a/glamor/glamor_transfer.c +++ b/glamor/glamor_transfer.c @@ -186,7 +186,7 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox, BoxPtr boxes = in_boxes; int nbox = in_nbox; - glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo->fb); + glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb); while (nbox--) {