summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2009-06-30 11:49:43 +0200
committerJakob Bornecrantz <[email protected]>2009-06-30 12:20:39 +0200
commit303cbb45b558a2b94e6922252cf57d115ba60b82 (patch)
treed56f9e58b8a3944ed7885bc1a72b1f786c98338e /src/gallium/drivers
parentefe9faf0612778db2423a4f8835b318b95d9efd7 (diff)
drm/st: Return drm_api struct from a function
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/i915simple/i915_texture.c3
-rw-r--r--src/gallium/drivers/i915simple/i915_winsys.h4
-rw-r--r--src/gallium/drivers/softpipe/sp_texture.c3
-rw-r--r--src/gallium/drivers/softpipe/sp_winsys.h5
4 files changed, 10 insertions, 5 deletions
diff --git a/src/gallium/drivers/i915simple/i915_texture.c b/src/gallium/drivers/i915simple/i915_texture.c
index ca8e87af8d1..211ba09fda8 100644
--- a/src/gallium/drivers/i915simple/i915_texture.c
+++ b/src/gallium/drivers/i915simple/i915_texture.c
@@ -738,7 +738,8 @@ i915_init_screen_texture_functions(struct pipe_screen *screen)
screen->tex_surface_destroy = i915_tex_surface_destroy;
}
-boolean i915_get_texture_buffer( struct pipe_texture *texture,
+boolean i915_get_texture_buffer( struct drm_api *api,
+ struct pipe_texture *texture,
struct pipe_buffer **buf,
unsigned *stride )
{
diff --git a/src/gallium/drivers/i915simple/i915_winsys.h b/src/gallium/drivers/i915simple/i915_winsys.h
index ff5b34f193a..58599daa805 100644
--- a/src/gallium/drivers/i915simple/i915_winsys.h
+++ b/src/gallium/drivers/i915simple/i915_winsys.h
@@ -61,6 +61,7 @@ struct pipe_buffer;
struct pipe_fence_handle;
struct pipe_winsys;
struct pipe_screen;
+struct drm_api;
/**
@@ -132,7 +133,8 @@ struct pipe_context *i915_create_context( struct pipe_screen *screen,
*
* This is needed for example kms.
*/
-boolean i915_get_texture_buffer( struct pipe_texture *texture,
+boolean i915_get_texture_buffer( struct drm_api *api,
+ struct pipe_texture *texture,
struct pipe_buffer **buf,
unsigned *stride );
diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index 7a533dad9f0..41d8a0f93e2 100644
--- a/src/gallium/drivers/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
@@ -403,7 +403,8 @@ softpipe_init_screen_texture_funcs(struct pipe_screen *screen)
boolean
-softpipe_get_texture_buffer( struct pipe_texture *texture,
+softpipe_get_texture_buffer( struct drm_api *api,
+ struct pipe_texture *texture,
struct pipe_buffer **buf,
unsigned *stride )
{
diff --git a/src/gallium/drivers/softpipe/sp_winsys.h b/src/gallium/drivers/softpipe/sp_winsys.h
index 9e571862b75..3edcbeb558f 100644
--- a/src/gallium/drivers/softpipe/sp_winsys.h
+++ b/src/gallium/drivers/softpipe/sp_winsys.h
@@ -39,7 +39,7 @@
extern "C" {
#endif
-
+struct drm_api;
struct pipe_screen;
struct pipe_winsys;
struct pipe_context;
@@ -53,7 +53,8 @@ softpipe_create_screen(struct pipe_winsys *);
boolean
-softpipe_get_texture_buffer( struct pipe_texture *texture,
+softpipe_get_texture_buffer( struct drm_api *api,
+ struct pipe_texture *texture,
struct pipe_buffer **buf,
unsigned *stride );