diff options
| author | Kenneth Graunke <[email protected]> | 2016-03-01 16:26:09 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-03-01 17:11:29 -0800 |
| commit | 89e421369c54a8edc4930352e062f03b5c66b886 (patch) | |
| tree | 54ec1f2d99454da125abe0ed49164b1c47fd9d36 /src/gallium/drivers/r600/r600_pipe.c | |
| parent | e941fd84707d4ed04a683f8862d184956a60f9ad (diff) | |
| parent | 1be953797ea4ae31193ab40bd35133eef38ae0ce (diff) | |
Merge remote-tracking branch 'origin/master' into vulkan
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 7fb4108a188..5a6ce71414c 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -136,7 +136,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, goto fail; rctx->screen = rscreen; - rctx->keep_tiling_flags = rscreen->b.info.drm_minor >= 12; r600_init_blit_functions(rctx); @@ -409,7 +408,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) return 12; case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: /* textures support 8192, but layered rendering supports 2048 */ - return rscreen->b.info.drm_minor >= 9 ? 2048 : 0; + return 2048; /* Render targets. */ case PIPE_CAP_MAX_RENDER_TARGETS: |