diff options
author | Keith Whitwell <keithw@vmware.com> | 2010-03-08 12:03:46 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2010-03-08 12:03:46 +0000 |
commit | 3ca933623cf0fd3b025ab7d1b37d3fd01c854807 (patch) | |
tree | e4682a56c3ff41f4d698dee76d94447a9343608e /src/gallium/drivers/r300/r300_texture.h | |
parent | 9860f652e271d03672ec3e5f0e379170953a1e56 (diff) | |
parent | 5024a39d111e2cef176a18e17f18917c2242ec72 (diff) |
Merge commit 'origin/gallium-winsys-handle-rebased'
Diffstat (limited to 'src/gallium/drivers/r300/r300_texture.h')
-rw-r--r-- | src/gallium/drivers/r300/r300_texture.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h index 46a5fb6188..138b62784e 100644 --- a/src/gallium/drivers/r300/r300_texture.h +++ b/src/gallium/drivers/r300/r300_texture.h @@ -60,13 +60,11 @@ r300_video_surface(struct pipe_video_surface *pvs) return (struct r300_video_surface *)pvs; } -#ifndef R300_WINSYS_H - +/* Used internally for texture_is_referenced() + */ boolean r300_get_texture_buffer(struct pipe_screen* screen, struct pipe_texture* texture, struct pipe_buffer** buffer, unsigned* stride); -#endif /* R300_WINSYS_H */ - #endif /* R300_TEXTURE_H */ |