[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55356] trunk/blender/source/blender/ editors: Feature:

[Ton Roosendaal]

Revision: 55356
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55356
Author:   ton
Date:     2013-03-17 16:54:06 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Feature:

Image Editor and 3D view background image now use new automatic switching for
drawing GPU texture or OpenGL DrawPixels too. For large zoomed images
it gives massive speedup.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c	2013-03-17 16:53:35 UTC (rev 55355)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c	2013-03-17 16:54:06 UTC (rev 55356)
@@ -491,6 +491,8 @@
 	/* set zoom */
 	glPixelZoom(zoomx, zoomy);
 
+	glaDefine2DArea(&ar->winrct);
+	
 	/* find window pixel coordinates of origin */
 	UI_view2d_to_region_no_clip(&ar->v2d, fx, fy, &x, &y);
 
@@ -523,11 +525,7 @@
 		display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
 
 		if (display_buffer)
-			glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, display_buffer);
-#if 0
-		else
-			glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_FLOAT, ibuf->rect_float);
-#endif
+			glaDrawPixelsAuto(x, y, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, display_buffer);
 
 		IMB_display_buffer_release(cache_handle);
 

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-03-17 16:53:35 UTC (rev 55355)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-03-17 16:54:06 UTC (rev 55356)
@@ -1819,7 +1819,7 @@
 
 			glPixelZoom(zoomx, zoomy);
 			glColor4f(1.0f, 1.0f, 1.0f, 1.0f - bgpic->blend);
-			glaDrawPixelsTex(x1, y1, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, ibuf->rect);
+			glaDrawPixelsAuto(x1, y1, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, ibuf->rect);
 
 			glPixelZoom(1.0, 1.0);
 			glPixelTransferf(GL_ALPHA_SCALE, 1.0f);