soc-2008-mxcurioni: made the image rendering faster by reading the frame buffer directly into the RenderResult's ImBuf structure, removing the need to copy it manually

2 files changed, 22 insertions, 14 deletions

diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index 15238ba6269..eb233bfcb7d 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -329,6 +329,7 @@ public:
 
   /*! glReadPixels */
   typedef enum{
+	RGBA,
     RGB,
     DEPTH
   } PixelFormat;
@@ -345,6 +346,9 @@ public:
     GLenum glformat;
     switch(format)
     {
+	    case RGBA:
+	      glformat = GL_RGBA;
+	      break;
     case RGB:
       glformat = GL_RGB;
       break;
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index d842e59d31b..906522b059e 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -48,21 +48,25 @@ extern "C" {
 
 		RenderResult rres;
 		RE_GetResultImage(re, &rres);
-		float *rgb = new float[3*width*height];
-		view->readPixels(0,0,width,height,AppGLWidget::RGB, rgb);
+		view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );
+		
+		// float *rgb = new float[3*width*height];
+		// view->readPixels(0,0,width,height,AppGLWidget::RGB, rgb);
+		// 
+		// for (unsigned short y=0; y<height; y++) {
+		// 	float* bpt = (float*)rres.rectf + ((y*width) << 2);			
+		// 	for (unsigned short x=0; x<width; x++) {
+		// 		float *pos = rgb + 3 * ( y*width + x );
+		// 		
+		// 		bpt[0] = pos[0]; // r
+		// 		bpt[1] = pos[1]; // g
+		// 		bpt[2] = pos[2]; // b
+		// 		bpt[3] = 1.0; // a
+		// 		bpt += 4;
+		// 	}
+		// }
+		// 
 		
-		for (unsigned short y=0; y<height; y++) {
-			float* bpt = (float*)rres.rectf + ((y*width) << 2);			
-			for (unsigned short x=0; x<width; x++) {
-				float *pos = rgb + 3 * ( y*width + x );
-				
-				bpt[0] = pos[0]; // r
-				bpt[1] = pos[1]; // g
-				bpt[2] = pos[2]; // b
-				bpt[3] = 1.0; // a
-				bpt += 4;
-			}
-		}
 		
 		re->result->renlay = render_get_active_layer(re, re->result);
 		re->display_draw(re->result, NULL);