i965g: more work on compiling

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

diff --git a/src/gallium/state_trackers/python/gallium.i b/src/gallium/state_trackers/python/gallium.i
index 1792f63c3c5b747c1237309fab6535006ae783c2..3f79cc1a3d74be0afc1790bb29c054613c85f3c3 100644 (file)
--- a/src/gallium/state_trackers/python/gallium.i
+++ b/src/gallium/state_trackers/python/gallium.i
@@ -37,24 +37,28 @@
 %{
 
 #include <stdio.h>
-#include <Python.h>
 
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_inlines.h"
-#include "pipe/p_util.h"
-#include "pipe/p_shader_tokens.h" 
+#include "pipe/p_shader_tokens.h"
 #include "cso_cache/cso_context.h"
-#include "util/u_draw_quad.h" 
-#include "util/p_tile.h" 
-#include "tgsi/tgsi_text.h" 
-#include "tgsi/tgsi_dump.h" 
+#include "util/u_draw_quad.h"
+#include "util/u_tile.h"
+#include "util/u_math.h"
+#include "util/u_memory.h"
+#include "tgsi/tgsi_text.h"
+#include "tgsi/tgsi_dump.h"
 
 #include "st_device.h"
 #include "st_sample.h"
 
 %}
 
+%include "typemaps.i"
+%include "exception.i"
+%include "cstring.i"
+
 %include "carrays.i"
 %array_class(unsigned char, ByteArray);
 %array_class(int, IntArray);
@@ -65,8 +69,8 @@
 %rename(Device) st_device;
 %rename(Context) st_context;
 %rename(Texture) pipe_texture;
-%rename(Surface) pipe_surface;
-%rename(Buffer) st_buffer;
+%rename(Surface) st_surface;
+%rename(Buffer) pipe_buffer;
 
 %rename(BlendColor) pipe_blend_color;
 %rename(Blend) pipe_blend_state;
@@ -88,7 +92,8 @@
 %rename(Viewport) pipe_viewport_state;
 
 
-%include "pipe/p_defines.h";
+%include "p_compiler.i"
+%include "p_defines.h";
 %include "p_format.i"
 
 %include "p_device.i"