Merge branch 'master' into pipe-video

[mesa.git] / src / gallium / drivers / nv40 / nv40_state.h

diff --git a/src/gallium/drivers/nv40/nv40_state.h b/src/gallium/drivers/nv40/nv40_state.h
index 192074e7471c8fe382e8b5f1f5f037870628cd5a..5754ca2328a5deb5df9f4b9ed44678c4cb8fe66f 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state.h
+++ b/src/gallium/drivers/nv40/nv40_state.h
@@ -2,6 +2,7 @@
 #define __NV40_STATE_H__
 
 #include "pipe/p_state.h"
+#include "pipe/p_video_state.h"
 #include "tgsi/tgsi_scan.h"
 
 struct nv40_sampler_state {
@@ -86,4 +87,16 @@ struct nv40_miptree {
        } level[PIPE_MAX_TEXTURE_LEVELS];
 };
 
+struct nv40_video_surface {
+       struct pipe_video_surface base;
+       struct pipe_texture *tex;
+};
+
+
+static INLINE struct nv40_video_surface*
+nv40_video_surface(struct pipe_video_surface *sfc)
+{
+   return (struct nv40_video_surface*)sfc;
+}
+
 #endif