From 8f1d2ab590432dd6254f2e124a874695c8e87aae Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Mon, 21 Dec 2009 18:20:31 +0100 Subject: python: fix some pipe_format_simplify merge damage --- src/gallium/state_trackers/python/p_device.i | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src') diff --git a/src/gallium/state_trackers/python/p_device.i b/src/gallium/state_trackers/python/p_device.i index fb793d5cbd..2dc995adb0 100644 --- a/src/gallium/state_trackers/python/p_device.i +++ b/src/gallium/state_trackers/python/p_device.i @@ -112,10 +112,6 @@ struct st_device { struct pipe_texture templat; memset(&templat, 0, sizeof(templat)); templat.format = format; -<<<<<<< HEAD - util_format_get_block(templat.format, &templat.block); -======= ->>>>>>> master templat.width0 = width; templat.height0 = height; templat.depth0 = depth; -- cgit v1.2.3