summaryrefslogtreecommitdiff
path: root/src/gallium/include
diff options
context:
space:
mode:
authorJakob Bornecrantz <wallbraker@gmail.com>2010-04-14 23:03:51 +0100
committerJakob Bornecrantz <wallbraker@gmail.com>2010-04-16 10:18:05 +0100
commit53c57191c5f24d3620e2e4ce95dd12b5c6e9109b (patch)
tree358239c993fbeb6429e2a0f4de91a5d0528caf0c /src/gallium/include
parent39c81dada01585a6030f03d215842a1a2ae87d86 (diff)
st/drisw: Stop pretending to be drm_api
Reviewed-by: George Sapountzis <gsapountzis@gmail.com>
Diffstat (limited to 'src/gallium/include')
-rw-r--r--src/gallium/include/state_tracker/drisw_api.h20
-rw-r--r--src/gallium/include/state_tracker/drm_api.h1
2 files changed, 4 insertions, 17 deletions
diff --git a/src/gallium/include/state_tracker/drisw_api.h b/src/gallium/include/state_tracker/drisw_api.h
index c6adebb4ec..944a649257 100644
--- a/src/gallium/include/state_tracker/drisw_api.h
+++ b/src/gallium/include/state_tracker/drisw_api.h
@@ -2,34 +2,22 @@
#define _DRISW_API_H_
#include "pipe/p_compiler.h"
-#include "pipe/p_screen.h"
-#include "pipe/p_format.h"
-
-#include "state_tracker/drm_api.h"
struct pipe_screen;
-struct pipe_winsys;
-struct pipe_buffer;
-struct pipe_context;
-struct pipe_texture;
-
struct dri_drawable;
/**
* This callback struct is intended for the winsys to call the loader.
*/
-
struct drisw_loader_funcs
{
void (*put_image) (struct dri_drawable *dri_drawable,
void *data, unsigned width, unsigned height);
};
-struct drisw_create_screen_arg
-{
- struct drm_create_screen_arg base;
-
- struct drisw_loader_funcs *lf;
-};
+/**
+ * Implemented by the drisw target.
+ */
+struct pipe_screen * drisw_create_screen(struct drisw_loader_funcs *lf);
#endif
diff --git a/src/gallium/include/state_tracker/drm_api.h b/src/gallium/include/state_tracker/drm_api.h
index 50c8c1cf19..3d8fdd86fc 100644
--- a/src/gallium/include/state_tracker/drm_api.h
+++ b/src/gallium/include/state_tracker/drm_api.h
@@ -13,7 +13,6 @@ struct pipe_resource;
enum drm_create_screen_mode {
DRM_CREATE_NORMAL = 0,
DRM_CREATE_DRI1,
- DRM_CREATE_DRISW,
DRM_CREATE_DRIVER = 1024,
DRM_CREATE_MAX
};