diff options
| author | Marek Olšák <[email protected]> | 2010-01-09 19:19:44 +0100 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2010-01-17 01:03:50 -0800 |
| commit | 8959608051ef8e4a97214323009d09c5e9e633fb (patch) | |
| tree | cd8c852f9e6e34c89a5ff7bc11856495b6e278ae /src/gallium/winsys/drm | |
| parent | 08edbe9f14712f719f838769c61123f83768af76 (diff) | |
r300g: output texture debug messages if only RADEON_DEBUG=tex is set
Diffstat (limited to 'src/gallium/winsys/drm')
| -rw-r--r-- | src/gallium/winsys/drm/radeon/core/radeon_drm.c | 7 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/radeon/core/radeon_drm.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.c b/src/gallium/winsys/drm/radeon/core/radeon_drm.c index 851c2236979..dd73b33ee0f 100644 --- a/src/gallium/winsys/drm/radeon/core/radeon_drm.c +++ b/src/gallium/winsys/drm/radeon/core/radeon_drm.c @@ -136,12 +136,13 @@ struct pipe_context* radeon_create_context(struct drm_api* api, } boolean radeon_buffer_from_texture(struct drm_api* api, + struct pipe_screen* screen, struct pipe_texture* texture, struct pipe_buffer** buffer, unsigned* stride) { /* XXX fix this */ - return r300_get_texture_buffer(texture, buffer, stride); + return r300_get_texture_buffer(screen, texture, buffer, stride); } /* Create a buffer from a handle. */ @@ -208,7 +209,7 @@ static boolean radeon_shared_handle_from_texture(struct drm_api *api, struct radeon_pipe_buffer* radeon_buffer; struct pipe_buffer *buffer = NULL; - if (!radeon_buffer_from_texture(api, texture, &buffer, stride)) { + if (!radeon_buffer_from_texture(api, screen, texture, &buffer, stride)) { return FALSE; } @@ -240,7 +241,7 @@ static boolean radeon_local_handle_from_texture(struct drm_api *api, unsigned *handle) { struct pipe_buffer *buffer = NULL; - if (!radeon_buffer_from_texture(api, texture, &buffer, stride)) { + if (!radeon_buffer_from_texture(api, screen, texture, &buffer, stride)) { return FALSE; } diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.h b/src/gallium/winsys/drm/radeon/core/radeon_drm.h index bf0e78138d7..28f2ba818e9 100644 --- a/src/gallium/winsys/drm/radeon/core/radeon_drm.h +++ b/src/gallium/winsys/drm/radeon/core/radeon_drm.h @@ -56,6 +56,7 @@ struct pipe_context* radeon_create_context(struct drm_api* api, struct pipe_screen* screen); boolean radeon_buffer_from_texture(struct drm_api* api, + struct pipe_screen* screen, struct pipe_texture* texture, struct pipe_buffer** buffer, unsigned* stride); |