X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplayback3d.C;h=7ed23652c61d1e23d5337c3b50f7364976116244;hb=9fed7535470aa37781733db836068da3b4c17a0d;hp=aefafc8e3f9c7c61fb5cbe71cc56494fc16a75e0;hpb=7ead9f7382846e81c2f8efb25780014e5f8834c3;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/playback3d.C b/cinelerra-5.1/cinelerra/playback3d.C
index aefafc8e..7ed23652 100644
--- a/cinelerra-5.1/cinelerra/playback3d.C
+++ b/cinelerra-5.1/cinelerra/playback3d.C
@@ -368,32 +368,11 @@ void Playback3DCommand::copy_from(BC_SynchronousCommand *command)
 	BC_SynchronousCommand::copy_from(command);
 }
 
-//#define GL_BUG 1
-#ifdef GL_BUG
-static void GLAPIENTRY glDebugCallback(GLenum source, GLenum type,
-	GLuint id, GLenum severity, GLsizei length, const GLchar* message,
-	const void* userParam)
-{
-  fprintf(stderr, "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n",
-	( type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : "" ),
-	type, severity, message );
-}
-#endif
-
 Playback3D::Playback3D(MWindow *mwindow)
  : BC_Synchronous()
 {
 	this->mwindow = mwindow;
 	temp_texture = 0;
-#ifdef GL_BUG
-	//Enabling OpenGL debug output
-	// this does not work
-	glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, 0, GL_TRUE);
-	glEnable(GL_DEBUG_OUTPUT);
-	glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-	glDebugMessageCallback(glDebugCallback, 0);
-	glEnable(GL_DEBUG_OUTPUT);
-#endif
 }
 
 Playback3D::~Playback3D()
@@ -419,10 +398,6 @@ void Playback3D::handle_command(BC_SynchronousCommand *command)
 			write_buffer_sync((Playback3DCommand*)command);
 			break;
 
-		case Playback3DCommand::FINISH_OUTPUT:
-			finish_output_sync((Playback3DCommand*)command);
-			break;
-
 		case Playback3DCommand::CLEAR_OUTPUT:
 			clear_output_sync((Playback3DCommand*)command);
 			break;
@@ -490,6 +465,7 @@ void Playback3D::copy_from_sync(Playback3DCommand *command)
 		command->canvas->lock_canvas("Playback3D::copy_from_sync");
 	if( window ) {
 		window->enable_opengl();
+		glFinish();
 		int w = command->input->get_w();
 		int h = command->input->get_h();
 
@@ -658,35 +634,21 @@ void Playback3D::write_buffer_sync(Playback3DCommand *command)
 	BC_WindowBase *window =
 		command->canvas->lock_canvas("Playback3D::write_buffer_sync");
 	if( window ) {
+		window->enable_opengl();
 // Update hidden cursor
 		window->update_video_cursor();
-// Make sure OpenGL is enabled first.
-		window->enable_opengl();
-
+		command->frame->enable_opengl();
+		command->frame->init_screen();
 //printf("Playback3D::write_buffer_sync 1 %d\n", window->get_id());
-		int flip_y = 0, frame_state = command->frame->get_opengl_state();
-		switch( frame_state ) {
-// Upload texture and composite to screen
-			case VFrame::RAM:
-				flip_y = 1;
-			case VFrame::SCREEN:
-				command->frame->to_texture();
-				window->enable_opengl();
-// Composite texture to screen and swap buffer
-			case VFrame::TEXTURE:
-				if( !flip_y ) {
-					int fh1 = command->frame->get_h()-1;
-					float in_y1 = fh1 - command->in_y1;
-					float in_y2 = fh1 - command->in_y2;
-					command->in_y1 = in_y2;
-					command->in_y2 = in_y1;
-				}
-				draw_output(command, flip_y);
-				break;
-			default:
-				printf("Playback3D::write_buffer_sync unknown state\n");
-				break;
+		int frame_state = command->frame->get_opengl_state();
+		if( frame_state != VFrame::TEXTURE )
+			command->frame->to_texture();
+		if( frame_state != VFrame::RAM ) {
+			command->in_y1 = command->frame->get_h() - command->in_y1;
+			command->in_y2 = command->frame->get_h() - command->in_y2;
 		}
+		window->enable_opengl();
+		draw_output(command, 1);
 		command->frame->set_opengl_state(frame_state);
 	}
 	command->canvas->unlock_canvas();
@@ -751,14 +713,8 @@ void Playback3D::draw_output(Playback3DCommand *command, int flip_y)
 
 
 //printf("Playback3D::draw_output 2 %f,%f %f,%f -> %f,%f %f,%f\n",
-// command->in_x1,
-// command->in_y1,
-// command->in_x2,
-// command->in_y2,
-// command->out_x1,
-// command->out_y1,
-// command->out_x2,
-// command->out_y2);
+// command->in_x1, command->in_y1, command->in_x2, command->in_y2,
+// command->out_x1, command->out_y1, command->out_x2, command->out_y2);
 
 		glUseProgram(0);
 
@@ -779,28 +735,6 @@ void Playback3D::init_frame(Playback3DCommand *command, int is_yuv)
 }
 
 
-void Playback3D::finish_output(Canvas *canvas)
-{
-	Playback3DCommand command;
-	command.canvas = canvas;
-	command.command = Playback3DCommand::FINISH_OUTPUT;
-	send_command(&command);
-}
-
-void Playback3D::finish_output_sync(Playback3DCommand *command)
-{
-#ifdef HAVE_GL
-	BC_WindowBase *window =
-		command->canvas->lock_canvas("Playback3D::finish_output_sync");
-	if( window ) {
-		command->canvas->get_canvas()->enable_opengl();
-		glFinish();
-	}
-	command->canvas->unlock_canvas();
-#endif
-}
-
-
 void Playback3D::clear_output(Canvas *canvas, VFrame *output)
 {
 	Playback3DCommand command;