#include "pipe/p_screen.h"
#include "pipe/p_context.h"
-#include "pipe/p_inlines.h"
#include "pipe/p_shader_tokens.h"
-#include "cso_cache/cso_context.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 "util/u_sampler.h"
+#include "cso_cache/cso_context.h"
#include "tgsi/tgsi_text.h"
#include "tgsi/tgsi_dump.h"
%rename(Device) st_device;
%rename(Context) st_context;
-%rename(Texture) pipe_texture;
+%rename(Resource) pipe_resource;
%rename(Surface) st_surface;
-%rename(Buffer) pipe_buffer;
%rename(BlendColor) pipe_blend_color;
%rename(Blend) pipe_blend_state;
%include "p_compiler.i"
-%include "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"