Merge branch 'master' into pipe-format-simplify

[mesa.git] / src / gallium / state_trackers / python / p_device.i

diff --git a/src/gallium/state_trackers/python/p_device.i b/src/gallium/state_trackers/python/p_device.i
index bfe3f051fc0f0c13432009823e291f0fcefd7780..fb793d5cbd836339df4cd3057c0f778c472f9f2b 100644 (file)
--- a/src/gallium/state_trackers/python/p_device.i
+++ b/src/gallium/state_trackers/python/p_device.i
@@ -112,7 +112,10 @@ 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;