Squashed commit of the following:

[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 68d2db3325a8d9c7e26b5e6c7008162593400515..c6084f78aee5877fc62c9285a8ffd634cd19caec 100644 (file)
--- a/src/gallium/state_trackers/python/gallium.i
+++ b/src/gallium/state_trackers/python/gallium.i
@@ -37,18 +37,22 @@
 %{
 
 #include <stdio.h>
-#include <Python.h>
 
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
-#include "pipe/p_inlines.h"
+#include "pipe/p_shader_tokens.h"
+#include "os/os_stream.h"
+#include "util/u_inlines.h"
+#include "util/u_draw_quad.h"
+#include "util/u_tile.h"
+#include "util/u_math.h"
+#include "util/u_format.h"
+#include "util/u_dump.h"
 #include "util/u_memory.h"
-#include "pipe/p_shader_tokens.h" 
+#include "util/u_sampler.h"
 #include "cso_cache/cso_context.h"
-#include "util/u_draw_quad.h" 
-#include "util/u_tile.h" 
-#include "tgsi/tgsi_text.h" 
-#include "tgsi/tgsi_dump.h" 
+#include "tgsi/tgsi_text.h"
+#include "tgsi/tgsi_dump.h"
 
 #include "st_device.h"
 #include "st_sample.h"
@@ -56,6 +60,8 @@
 %}
 
 %include "typemaps.i"
+%include "exception.i"
+%include "cstring.i"
 
 %include "carrays.i"
 %array_class(unsigned char, ByteArray);
@@ -66,19 +72,16 @@
 
 %rename(Device) st_device;
 %rename(Context) st_context;
-%rename(Texture) pipe_texture;
-%rename(Surface) pipe_surface;
-%rename(Buffer) st_buffer;
+%rename(Resource) pipe_resource;
+%rename(Surface) st_surface;
 
 %rename(BlendColor) pipe_blend_color;
 %rename(Blend) pipe_blend_state;
 %rename(Clip) pipe_clip_state;
-%rename(ConstantBuffer) pipe_constant_buffer;
 %rename(Depth) pipe_depth_state;
 %rename(Stencil) pipe_stencil_state;
 %rename(Alpha) pipe_alpha_state;
 %rename(DepthStencilAlpha) pipe_depth_stencil_alpha_state;
-%rename(FormatBlock) pipe_format_block;
 %rename(Framebuffer) pipe_framebuffer_state;
 %rename(PolyStipple) pipe_poly_stipple;
 %rename(Rasterizer) pipe_rasterizer_state;
@@ -91,11 +94,12 @@
 
 
 %include "p_compiler.i"
-%include "pipe/p_defines.h";
-%include "p_format.i"
+%include "p_defines.h"
+%include "p_format.h"
 
 %include "p_device.i"
 %include "p_context.i"
 %include "p_texture.i"
 %include "p_state.i"
 
+%include "u_format.i"