Mesa (master): python: fix python state tracker after some latest changes

[Zack Rusin]

Module: Mesa
Branch: master
Commit: e9c6f01a52fe5f9ba993505c246740dd20fab344
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9c6f01a52fe5f9ba993505c246740dd20fab344

Author: Zack Rusin <zackr at vmware.com>
Date:   Wed Dec 23 13:43:30 2009 -0500

python: fix python state tracker after some latest changes

---

 src/gallium/state_trackers/python/gallium.i   |    1 +
 src/gallium/state_trackers/python/p_texture.i |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gallium/state_trackers/python/gallium.i b/src/gallium/state_trackers/python/gallium.i
index 8e323f4..96b13c2 100644
--- a/src/gallium/state_trackers/python/gallium.i
+++ b/src/gallium/state_trackers/python/gallium.i
@@ -46,6 +46,7 @@
 #include "util/u_draw_quad.h"
 #include "util/u_tile.h"
 #include "util/u_math.h"
+#include "util/u_format.h"
 #include "util/u_memory.h"
 #include "tgsi/tgsi_text.h"
 #include "tgsi/tgsi_dump.h"
diff --git a/src/gallium/state_trackers/python/p_texture.i b/src/gallium/state_trackers/python/p_texture.i
index 1de7f86..761587d 100644
--- a/src/gallium/state_trackers/python/p_texture.i
+++ b/src/gallium/state_trackers/python/p_texture.i
@@ -132,8 +132,8 @@ struct st_surface
       struct pipe_transfer *transfer;
       unsigned stride;
 
-      stride = pf_get_stride(texture->format, w);
-      *LENGTH = pf_get_nblocksy(texture->format, h) * stride;
+      stride = util_format_get_stride(texture->format, w);
+      *LENGTH = util_format_get_nblocksy(texture->format, h) * stride;
       *STRING = (char *) malloc(*LENGTH);
       if(!*STRING)
          return;
@@ -159,9 +159,9 @@ struct st_surface
       struct pipe_transfer *transfer;
      
       if(stride == 0)
-         stride = pf_get_stride(texture->format, w);
+         stride = util_format_get_stride(texture->format, w);
       
-      if(LENGTH < pf_get_nblocksy(texture->format, h) * stride)
+      if(LENGTH < util_format_get_nblocksy(texture->format, h) * stride)
          SWIG_exception(SWIG_ValueError, "offset must be smaller than buffer size");
          
       transfer = screen->get_tex_transfer(screen,