diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-02-08 16:35:32 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-02-08 17:17:58 +0000 |
| commit | 6447b20ce078f057cc5a5a2d6255df45afe8b30d (patch) | |
| tree | 5cbd96f8c819668f86b782c397d2c1c906b3e727 /src/gallium/winsys/drm/radeon/core/radeon_drm.c | |
| parent | ebe2f7609533645e7e9c8af4a55bc0127b9bc515 (diff) | |
drm/radeon: remove softpipe references
Diffstat (limited to 'src/gallium/winsys/drm/radeon/core/radeon_drm.c')
| -rw-r--r-- | src/gallium/winsys/drm/radeon/core/radeon_drm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.c b/src/gallium/winsys/drm/radeon/core/radeon_drm.c index d1cb649366..257bdca223 100644 --- a/src/gallium/winsys/drm/radeon/core/radeon_drm.c +++ b/src/gallium/winsys/drm/radeon/core/radeon_drm.c @@ -29,8 +29,6 @@ * Joakim Sindholt <opensource@zhasha.com> */ -#include "softpipe/sp_winsys.h" - #include "radeon_drm.h" /* Helper function to do the ioctls needed for setup and init. */ @@ -128,10 +126,10 @@ struct pipe_screen* radeon_create_screen(struct drm_api* api, struct radeon_winsys* rwinsys = radeon_pipe_winsys(drmFB); do_ioctls(drmFB, rwinsys); - if (!is_r3xx(rwinsys->pci_id) || - debug_get_bool_option("RADEON_SOFTPIPE", FALSE)) { - return softpipe_create_screen((struct pipe_winsys*)rwinsys); - } else { + /* The state tracker can organize a softpipe fallback if no hw + * driver is found. + */ + if (is_r3xx(rwinsys->pci_id)) { radeon_setup_winsys(drmFB, rwinsys); return r300_create_screen(rwinsys); } |