diff options
Diffstat (limited to 'src/gallium/state_trackers/python/p_device.i')
-rw-r--r-- | src/gallium/state_trackers/python/p_device.i | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/python/p_device.i b/src/gallium/state_trackers/python/p_device.i index 2dc995adb0..fb793d5cbd 100644 --- a/src/gallium/state_trackers/python/p_device.i +++ b/src/gallium/state_trackers/python/p_device.i @@ -112,6 +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; |