summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2009-12-21 18:20:31 +0100
committerRoland Scheidegger <sroland@vmware.com>2009-12-21 18:20:31 +0100
commit8f1d2ab590432dd6254f2e124a874695c8e87aae (patch)
treef5f38d65592f0f2131cf11a4e047a22fe1372000
parentba251376556835e84c7edb9b02b3fdefde32908a (diff)
python: fix some pipe_format_simplify merge damage
-rw-r--r--src/gallium/state_trackers/python/p_device.i4
1 files changed, 0 insertions, 4 deletions
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;