Mesa (master): python: fix some pipe_format_simplify merge damage
Roland Scheidegger
sroland at kemper.freedesktop.org
Mon Dec 21 17:21:02 UTC 2009
Module: Mesa
Branch: master
Commit: 8f1d2ab590432dd6254f2e124a874695c8e87aae
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f1d2ab590432dd6254f2e124a874695c8e87aae
Author: Roland Scheidegger <sroland at vmware.com>
Date: Mon Dec 21 18:20:31 2009 +0100
python: fix some pipe_format_simplify merge damage
---
src/gallium/state_trackers/python/p_device.i | 4 ----
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 fb793d5..2dc995a 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;
More information about the mesa-commit
mailing list