diff options
| author | Marek Olšák <[email protected]> | 2013-11-28 15:09:35 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-12-12 18:34:11 +0100 |
| commit | bba39d88046670bdd4db2ab1e7ba07b7e4ae277c (patch) | |
| tree | 5032f301e11eccd53559f169cec273f3e418d654 /src/gallium/drivers/r600/r600_pipe.c | |
| parent | 32fd445daa9a7ba4072c0f0ba851f06b8574e9f8 (diff) | |
r600g,radeonsi: share flags has_cp_dma and has_streamout
Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index f381e30b628..0075ae67c4e 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -469,9 +469,9 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) /* Stream output. */ case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: - return rscreen->has_streamout ? 4 : 0; + return rscreen->b.has_streamout ? 4 : 0; case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: - return rscreen->has_streamout ? 1 : 0; + return rscreen->b.has_streamout ? 1 : 0; case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: return 32*4; @@ -914,20 +914,20 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) switch (rscreen->b.chip_class) { case R600: if (rscreen->b.family < CHIP_RS780) { - rscreen->has_streamout = rscreen->b.info.drm_minor >= 14; + rscreen->b.has_streamout = rscreen->b.info.drm_minor >= 14; } else { - rscreen->has_streamout = rscreen->b.info.drm_minor >= 23; + rscreen->b.has_streamout = rscreen->b.info.drm_minor >= 23; } break; case R700: - rscreen->has_streamout = rscreen->b.info.drm_minor >= 17; + rscreen->b.has_streamout = rscreen->b.info.drm_minor >= 17; break; case EVERGREEN: case CAYMAN: - rscreen->has_streamout = rscreen->b.info.drm_minor >= 14; + rscreen->b.has_streamout = rscreen->b.info.drm_minor >= 14; break; default: - rscreen->has_streamout = FALSE; + rscreen->b.has_streamout = FALSE; break; } @@ -951,7 +951,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) rscreen->has_compressed_msaa_texturing = false; } - rscreen->has_cp_dma = rscreen->b.info.drm_minor >= 27 && + rscreen->b.has_cp_dma = rscreen->b.info.drm_minor >= 27 && !(rscreen->b.debug_flags & DBG_NO_CP_DMA); rscreen->global_pool = compute_memory_pool_new(rscreen); |