@@ -585,50 +585,54 @@ struct OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings, public WithPe
585585 GLenum debug_attachment = do_debug ? GL_COLOR_ATTACHMENT0 : GL_NONE;
586586
587587 gl ()->glGenFramebuffers (1 , &stage1_framebuffer);
588- gl ()->glBindFramebuffer (GL_DRAW_FRAMEBUFFER , stage1_framebuffer);
588+ gl ()->glBindFramebuffer (GL_FRAMEBUFFER , stage1_framebuffer);
589589
590590 const GLenum stage1_buffers[] = { debug_attachment, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3, GL_COLOR_ATTACHMENT4 };
591591 gl ()->glDrawBuffers (5 , stage1_buffers);
592+ glReadBuffer (GL_COLOR_ATTACHMENT4);
592593
593594 if (do_debug) gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE, stage1_debug.texture , 0 );
594595 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_RECTANGLE, stage1_data[0 ].texture , 0 );
595596 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT2, GL_TEXTURE_RECTANGLE, stage1_data[1 ].texture , 0 );
596597 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT3, GL_TEXTURE_RECTANGLE, stage1_data[2 ].texture , 0 );
597598 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT4, GL_TEXTURE_RECTANGLE, stage1_infrared.texture , 0 );
598- checkFBO (GL_DRAW_FRAMEBUFFER );
599+ checkFBO (GL_FRAMEBUFFER );
599600
600601 gl ()->glGenFramebuffers (1 , &filter1_framebuffer);
601- gl ()->glBindFramebuffer (GL_DRAW_FRAMEBUFFER , filter1_framebuffer);
602+ gl ()->glBindFramebuffer (GL_FRAMEBUFFER , filter1_framebuffer);
602603
603604 const GLenum filter1_buffers[] = { debug_attachment, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3 };
604605 gl ()->glDrawBuffers (4 , filter1_buffers);
606+ glReadBuffer (GL_NONE);
605607
606608 if (do_debug) gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE, filter1_debug.texture , 0 );
607609 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_RECTANGLE, filter1_data[0 ].texture , 0 );
608610 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT2, GL_TEXTURE_RECTANGLE, filter1_data[1 ].texture , 0 );
609611 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT3, GL_TEXTURE_RECTANGLE, filter1_max_edge_test.texture , 0 );
610- checkFBO (GL_DRAW_FRAMEBUFFER );
612+ checkFBO (GL_FRAMEBUFFER );
611613
612614 gl ()->glGenFramebuffers (1 , &stage2_framebuffer);
613- gl ()->glBindFramebuffer (GL_DRAW_FRAMEBUFFER , stage2_framebuffer);
615+ gl ()->glBindFramebuffer (GL_FRAMEBUFFER , stage2_framebuffer);
614616
615617 const GLenum stage2_buffers[] = { debug_attachment, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 };
616618 gl ()->glDrawBuffers (3 , stage2_buffers);
619+ glReadBuffer (GL_COLOR_ATTACHMENT1);
617620
618621 if (do_debug) gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE, stage2_debug.texture , 0 );
619622 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_RECTANGLE, stage2_depth.texture , 0 );
620623 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT2, GL_TEXTURE_RECTANGLE, stage2_depth_and_ir_sum.texture , 0 );
621- checkFBO (GL_DRAW_FRAMEBUFFER );
624+ checkFBO (GL_FRAMEBUFFER );
622625
623626 gl ()->glGenFramebuffers (1 , &filter2_framebuffer);
624- gl ()->glBindFramebuffer (GL_DRAW_FRAMEBUFFER , filter2_framebuffer);
627+ gl ()->glBindFramebuffer (GL_FRAMEBUFFER , filter2_framebuffer);
625628
626629 const GLenum filter2_buffers[] = { debug_attachment, GL_COLOR_ATTACHMENT1 };
627630 gl ()->glDrawBuffers (2 , filter2_buffers);
631+ glReadBuffer (GL_COLOR_ATTACHMENT1);
628632
629633 if (do_debug) gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE, filter2_debug.texture , 0 );
630634 gl ()->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_RECTANGLE, filter2_depth.texture , 0 );
631- checkFBO (GL_DRAW_FRAMEBUFFER );
635+ checkFBO (GL_FRAMEBUFFER );
632636
633637 Vertex bl = {-1 .0f , -1 .0f , 0 .0f , 0 .0f }, br = { 1 .0f , -1 .0f , 512 .0f , 0 .0f }, tl = {-1 .0f , 1 .0f , 0 .0f , 424 .0f }, tr = { 1 .0f , 1 .0f , 512 .0f , 424 .0f };
634638 Vertex vertices[] = {
0 commit comments