diff options
| author | Marek Olšák <[email protected]> | 2011-09-17 13:56:09 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-09-30 23:19:52 +0200 |
| commit | 518557d74abd4ce035dae079ff6eb1b08cc639d0 (patch) | |
| tree | d080bff97deb7653a9f22dff8c8c9d711452ba23 /src/gallium/drivers/r600/r600_texture.c | |
| parent | 6101b6d442b06a347c001fe85848d636ab7df260 (diff) | |
r600g: move family and chip_class from struct radeon to r600_screen
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_texture.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 412efa5a243..99eb1aa4692 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -248,8 +248,7 @@ static void r600_setup_miptree(struct pipe_screen *screen, unsigned array_mode) { struct pipe_resource *ptex = &rtex->resource.b.b.b; - struct radeon *radeon = ((struct r600_screen*)screen)->radeon; - enum chip_class chipc = r600_get_family_class(radeon); + enum chip_class chipc = ((struct r600_screen*)screen)->chip_class; unsigned size, layer_size, i, offset; unsigned nblocksx, nblocksy; @@ -396,7 +395,7 @@ r600_texture_create_object(struct pipe_screen *screen, /* We must split depth and stencil into two separate buffers on Evergreen. */ if (!(base->flags & R600_RESOURCE_FLAG_TRANSFER) && - r600_get_family_class(((struct r600_screen*)screen)->radeon) >= EVERGREEN && + ((struct r600_screen*)screen)->chip_class >= EVERGREEN && util_format_is_depth_and_stencil(base->format)) { struct pipe_resource stencil; unsigned stencil_pitch_override = 0; |