X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplayback3d.C;h=ba21998ccdc37675aab25a20b905e34cf42a35bd;hp=6d6dee358b5bc18e72fae98e0ed45ce3b131cf59;hb=8bd72f90925843be9ab9182c89761ee0640e7873;hpb=02a79c110b1bce1d500849c82b2098863cd60424 diff --git a/cinelerra-5.1/cinelerra/playback3d.C b/cinelerra-5.1/cinelerra/playback3d.C index 6d6dee35..ba21998c 100644 --- a/cinelerra-5.1/cinelerra/playback3d.C +++ b/cinelerra-5.1/cinelerra/playback3d.C @@ -960,19 +960,6 @@ void Playback3D::overlay_sync(Playback3DCommand *command) glColor4f(1, 1, 1, 1); glDisable(GL_BLEND); - if(command->frame) { -// Render to PBuffer - command->frame->enable_opengl(); - command->frame->set_opengl_state(VFrame::SCREEN); - canvas_w = command->frame->get_w(); - canvas_h = command->frame->get_h(); - } - else { -// Render to canvas - canvas_w = window->get_w(); - canvas_h = window->get_h(); - } - //printf("Playback3D::overlay_sync 1 %d\n", command->input->get_opengl_state()); switch( command->input->get_opengl_state() ) { @@ -987,16 +974,26 @@ void Playback3D::overlay_sync(Playback3DCommand *command) case VFrame::SCREEN: command->input->enable_opengl(); command->input->screen_to_texture(); - if(command->frame) - command->frame->enable_opengl(); - else - window->enable_opengl(); break; default: printf("Playback3D::overlay_sync unknown state\n"); break; } + if(command->frame) { +// Render to PBuffer + command->frame->enable_opengl(); + command->frame->set_opengl_state(VFrame::SCREEN); + canvas_w = command->frame->get_w(); + canvas_h = command->frame->get_h(); + } + else { +// Render to canvas + window->enable_opengl(); + canvas_w = window->get_w(); + canvas_h = window->get_h(); + } + const char *shader_stack[16]; memset(shader_stack,0, sizeof(shader_stack));