diff options
Diffstat (limited to 'lib/mesa/src/gallium/include')
4 files changed, 16 insertions, 22 deletions
diff --git a/lib/mesa/src/gallium/include/state_tracker/drisw_api.h b/lib/mesa/src/gallium/include/state_tracker/drisw_api.h index 4b5d36c17..328440cf5 100644 --- a/lib/mesa/src/gallium/include/state_tracker/drisw_api.h +++ b/lib/mesa/src/gallium/include/state_tracker/drisw_api.h @@ -2,7 +2,6 @@ #define _DRISW_API_H_ #include "pipe/p_compiler.h" -#include "sw_winsys.h" struct pipe_screen; struct dri_drawable; @@ -12,16 +11,15 @@ struct dri_drawable; */ struct drisw_loader_funcs { - void (*get_image) (struct dri_drawable *dri_drawable, - int x, int y, unsigned width, unsigned height, unsigned stride, - void *data); void (*put_image) (struct dri_drawable *dri_drawable, void *data, unsigned width, unsigned height); void (*put_image2) (struct dri_drawable *dri_drawable, void *data, int x, int y, unsigned width, unsigned height, unsigned stride); - void (*put_image_shm) (struct dri_drawable *dri_drawable, - int shmid, char *shmaddr, unsigned offset, unsigned offset_x, - int x, int y, unsigned width, unsigned height, unsigned stride); }; +/** + * Implemented by the drisw target. + */ +struct pipe_screen * drisw_create_screen(struct drisw_loader_funcs *lf); + #endif diff --git a/lib/mesa/src/gallium/include/state_tracker/graw.h b/lib/mesa/src/gallium/include/state_tracker/graw.h index af81cc887..217fa31ba 100644 --- a/lib/mesa/src/gallium/include/state_tracker/graw.h +++ b/lib/mesa/src/gallium/include/state_tracker/graw.h @@ -33,7 +33,7 @@ * necessary to implement this interface is orchestrated by the * individual target building this entity. * - * For instance, the graw-xlib target includes code to implement these + * For instance, the graw-xlib target includes code to implent these * interfaces on top of the X window system. * * Programs using this interface may additionally benefit from some of @@ -79,7 +79,7 @@ PUBLIC void *graw_parse_fragment_shader( struct pipe_context *pipe, * If an option has been successfully parsed, argi is updated * to point just after the option and return TRUE. */ -PUBLIC bool graw_parse_args(int *argi, int argc, char *argv[]); +PUBLIC boolean graw_parse_args(int *argi, int argc, char *argv[]); /* Saves surface contents to a file. * @@ -89,8 +89,8 @@ PUBLIC bool graw_parse_args(int *argi, int argc, char *argv[]); * * Returns TRUE if the surface has been saved. */ -PUBLIC bool graw_save_surface_to_file(struct pipe_context *pipe, - struct pipe_surface *surface, - const char *filename); +PUBLIC boolean graw_save_surface_to_file(struct pipe_context *pipe, + struct pipe_surface *surface, + const char *filename); #endif diff --git a/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h b/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h index 43a73830f..a3479eb0b 100644 --- a/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h +++ b/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h @@ -35,14 +35,16 @@ #define SW_WINSYS_H +#include "pipe/p_compiler.h" /* for boolean */ #include "pipe/p_format.h" -#include "state_tracker/winsys_handle.h" + #ifdef __cplusplus extern "C" { #endif +struct winsys_handle; struct pipe_screen; struct pipe_context; struct pipe_resource; @@ -66,7 +68,7 @@ struct sw_winsys void (*destroy)( struct sw_winsys *ws ); - bool + boolean (*is_displaytarget_format_supported)( struct sw_winsys *ws, unsigned tex_usage, enum pipe_format format ); @@ -88,7 +90,6 @@ struct sw_winsys enum pipe_format format, unsigned width, unsigned height, unsigned alignment, - const void *front_private, unsigned *stride ); /** @@ -103,7 +104,7 @@ struct sw_winsys /** * Used to implement texture_get_handle. */ - bool + boolean (*displaytarget_get_handle)( struct sw_winsys *ws, struct sw_displaytarget *dt, struct winsys_handle *whandle ); diff --git a/lib/mesa/src/gallium/include/state_tracker/vdpau_interop.h b/lib/mesa/src/gallium/include/state_tracker/vdpau_interop.h index 04d455a37..3ca7c9d4a 100644 --- a/lib/mesa/src/gallium/include/state_tracker/vdpau_interop.h +++ b/lib/mesa/src/gallium/include/state_tracker/vdpau_interop.h @@ -35,13 +35,8 @@ #define _VDPAU_INTEROP_H_ /* driver specific functions for NV_vdpau_interop */ -#ifndef VDP_FUNC_ID_BASE_DRIVER -#define VDP_FUNC_ID_BASE_DRIVER 0x2000 -#endif -/* Older implementation relying on passing pipe_video_buffer and - * pipe_resources around. Deprecated and shouldn't be used for new things. - */ +#define VDP_FUNC_ID_BASE_DRIVER 0x2000 #define VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM (VDP_FUNC_ID_BASE_DRIVER + 0) #define VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM (VDP_FUNC_ID_BASE_DRIVER + 1) |