Merge branch 'glsl2-head' into glsl2

[mesa.git] / src / gallium / targets / xorg-vmwgfx / vmw_driver.h

diff --git a/src/gallium/targets/xorg-vmwgfx/vmw_driver.h b/src/gallium/targets/xorg-vmwgfx/vmw_driver.h
index ba754b51e47619f90c77e76b644afd81db19e235..d6e3620cd3d1baf8cfbb7a1a578e6afc566b89b6 100644 (file)
--- a/src/gallium/targets/xorg-vmwgfx/vmw_driver.h
+++ b/src/gallium/targets/xorg-vmwgfx/vmw_driver.h
@@ -40,6 +40,14 @@
 
 struct vmw_dma_buffer;
 
+struct vmw_rect
+{
+    int32_t x;
+    int32_t y;
+    uint32_t w;
+    uint32_t h;
+};
+
 struct vmw_customizer
 {
     CustomizerRec base;
@@ -59,6 +67,12 @@ vmw_customizer(CustomizerPtr cust)
     return cust ? (struct vmw_customizer *) cust : NULL;
 }
 
+/***********************************************************************
+ * vmw_ctrl.c
+ */
+
+void vmw_ctrl_ext_init(struct vmw_customizer *vmw);
+
 
 /***********************************************************************
  * vmw_video.c
@@ -99,5 +113,7 @@ int vmw_ioctl_unref_stream(struct vmw_customizer *vmw, uint32_t stream_id);
 
 int vmw_ioctl_claim_stream(struct vmw_customizer *vmw, uint32_t *out);
 
+int vmw_ioctl_update_layout(struct vmw_customizer *vmw, uint32_t num, struct vmw_rect *rects);
+
 
 #endif