[[ Bug 13261 ]] Update OSX stacksurface

livecodeian · livecodeian · commit b640dbca14d3 · 2014-08-26T12:45:55.000+01:00
diff --git a/docs/notes/bugfix-13261.md b/docs/notes/bugfix-13261.md
@@ -0,0 +1 @@
+# Visual effect push problem
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -393,9 +393,9 @@ class MCDesktopStackSurface: public MCStackSurface
 	}
 	
     // MM-2014-07-31: [[ ThreadedRendering ]] Updated to wrap new platform surface API.
-	bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster)
+	bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)
 	{
-		return MCPlatformSurfaceLockPixels(m_surface, p_area, r_raster);
+		return MCPlatformSurfaceLockPixels(m_surface, p_area, r_raster, r_locked_area);
 	}
 	
     // MM-2014-07-31: [[ ThreadedRendering ]] Updated to wrap new platform surface API.
diff --git a/engine/src/mac-internal.h b/engine/src/mac-internal.h
@@ -366,7 +366,7 @@ class MCMacPlatformSurface: public MCPlatformSurface
 	virtual bool LockGraphics(MCGIntegerRectangle area, MCGContextRef& r_context, MCGRaster &r_raster);
 	virtual void UnlockGraphics(MCGIntegerRectangle area, MCGContextRef context, MCGRaster &raster);
 	
-	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster);
+	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area);
 	virtual void UnlockPixels(MCGIntegerRectangle area, MCGRaster& raster);
 	
 	virtual bool LockSystemContext(void*& r_context);
diff --git a/engine/src/mac-surface.mm b/engine/src/mac-surface.mm
@@ -88,7 +88,8 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
 bool MCMacPlatformSurface::LockGraphics(MCGIntegerRectangle p_region, MCGContextRef& r_context, MCGRaster &r_raster)
 {
 	MCGRaster t_raster;
-	if (LockPixels(p_region, t_raster))
+	MCGIntegerRectangle t_locked_area;
+	if (LockPixels(p_region, t_raster, t_locked_area))
 	{
         MCGContextRef t_gcontext;
 		if (MCGContextCreateWithRaster(t_raster, t_gcontext))
@@ -100,10 +101,7 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
 			MCGContextScaleCTM(t_gcontext, t_scale, t_scale);
 			
 			// Set origin
-            MCGIntegerRectangle t_bounds;
-            t_bounds = MCGRegionGetBounds(m_update_rgn);
-            
-			MCGContextTranslateCTM(t_gcontext, -p_region . origin . x, -p_region . origin . y);
+			MCGContextTranslateCTM(t_gcontext, -t_locked_area . origin . x, -t_locked_area . origin . y);
 			
 			// Set clipping rect
             MCGContextClipToRegion(t_gcontext, m_update_rgn);
@@ -114,6 +112,8 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
 			
 			return true;
 		}
+		
+		UnlockPixels(t_locked_area, t_raster);
 	}
     return false;
 }
@@ -131,7 +131,7 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
 // MM-2014-07-31: [[ ThreadedRendering ]] Updated to use the new platform surface API.
 //  We create a single backing buffer for the entire surface (created the first time lock pixels is called)
 //  and return a raster that points to the desired region of the backing buffer.
-bool MCMacPlatformSurface::LockPixels(MCGIntegerRectangle p_region, MCGRaster& r_raster)
+bool MCMacPlatformSurface::LockPixels(MCGIntegerRectangle p_region, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)
 {
     MCGIntegerRectangle t_bounds;
     t_bounds = MCGRegionGetBounds(m_update_rgn);
@@ -165,6 +165,8 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
     r_raster . format = kMCGRasterFormat_xRGB;
     r_raster . pixels = (uint8_t*)m_raster . pixels + (int32_t)((t_actual_area . origin . y - t_bounds . origin.y) * t_scale * m_raster . stride + (t_actual_area . origin . x - t_bounds . origin . x) * t_scale * sizeof(uint32_t));
     
+	r_locked_area = t_actual_area;
+	
     return true;
 }
 
diff --git a/engine/src/platform-internal.h b/engine/src/platform-internal.h
@@ -30,7 +30,7 @@ class MCPlatformSurface
 	virtual bool LockGraphics(MCGIntegerRectangle area, MCGContextRef& r_context, MCGRaster &r_raster) = 0;
 	virtual void UnlockGraphics(MCGIntegerRectangle area, MCGContextRef context, MCGRaster &raster) = 0;
 	
-	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster) = 0;
+	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area) = 0;
 	virtual void UnlockPixels(MCGIntegerRectangle area, MCGRaster& raster) = 0;
 	
 	virtual bool LockSystemContext(void*& r_context) = 0;
diff --git a/engine/src/platform-surface.cpp b/engine/src/platform-surface.cpp
@@ -48,9 +48,9 @@ void MCPlatformSurfaceUnlockGraphics(MCPlatformSurfaceRef p_surface, MCGIntegerR
 }
 
 // MM-2014-07-31: [[ ThreadedRendering ]] Updated to use new platform surface API.
-bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef p_surface, MCGIntegerRectangle p_region, MCGRaster& r_raster)
+bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef p_surface, MCGIntegerRectangle p_region, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)
 {
-	return p_surface -> LockPixels(p_region, r_raster);
+	return p_surface -> LockPixels(p_region, r_raster, r_locked_area);
 }
 
 // MM-2014-07-31: [[ ThreadedRendering ]] Updated to use new platform surface API.
diff --git a/engine/src/platform.h b/engine/src/platform.h
@@ -903,7 +903,8 @@ bool MCPlatformSurfaceLockGraphics(MCPlatformSurfaceRef surface, MCGIntegerRecta
 void MCPlatformSurfaceUnlockGraphics(MCPlatformSurfaceRef surface, MCGIntegerRectangle region, MCGContextRef p_context, MCGRaster& p_raster);
 
 // MM-2014-07-31: [[ ThreadedRendering ]] Updated to match new platform surface API.
-bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef surface, MCGIntegerRectangle region, MCGRaster& r_raster);
+// IM-2014-08-26: [[ Bug 13261 ]] Return the actual locked area covered by the pixels
+bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef surface, MCGIntegerRectangle region, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area);
 void MCPlatformSurfaceUnlockPixels(MCPlatformSurfaceRef surface, MCGIntegerRectangle region, MCGRaster& p_raster);
 
 bool MCPlatformSurfaceLockSystemContext(MCPlatformSurfaceRef surface, void*& r_context);

Original file line number	Diff line number	Diff line change
`@@ -393,9 +393,9 @@ class MCDesktopStackSurface: public MCStackSurface`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`// MM-2014-07-31: [[ ThreadedRendering ]] Updated to wrap new platform surface API.`
`396`		`- bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster)`
	`396`	`+ bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)`
`397`	`397`	`{`
`398`		`- return MCPlatformSurfaceLockPixels(m_surface, p_area, r_raster);`
	`398`	`+ return MCPlatformSurfaceLockPixels(m_surface, p_area, r_raster, r_locked_area);`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`// MM-2014-07-31: [[ ThreadedRendering ]] Updated to wrap new platform surface API.`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ void MCPlatformSurfaceUnlockGraphics(MCPlatformSurfaceRef p_surface, MCGIntegerR`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// MM-2014-07-31: [[ ThreadedRendering ]] Updated to use new platform surface API.`
`51`		`-bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef p_surface, MCGIntegerRectangle p_region, MCGRaster& r_raster)`
	`51`	`+bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef p_surface, MCGIntegerRectangle p_region, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)`
`52`	`52`	`{`
`53`		`- return p_surface -> LockPixels(p_region, r_raster);`
	`53`	`+ return p_surface -> LockPixels(p_region, r_raster, r_locked_area);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// MM-2014-07-31: [[ ThreadedRendering ]] Updated to use new platform surface API.`