diff options
| author | Kenneth Graunke <[email protected]> | 2013-06-28 15:00:07 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-07-03 10:48:14 -0700 |
| commit | 7e4007a1b34ad29ef6441d9b20d0999c32350bd6 (patch) | |
| tree | ca3bb139d04c9f8c0fd789a58a34da4b342266fe | |
| parent | bc51f15b320235c06bf666cf870e9995d6cecc6b (diff) | |
i965: Combine GL_TEXTURE_CUBE_MAP_ARRAY case with the other array cases.
These do the exact same thing; combining them is tidier.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tex_layout.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c index fc929f855a5..17720578c79 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c @@ -150,10 +150,6 @@ void brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt) { switch (mt->target) { - case GL_TEXTURE_CUBE_MAP_ARRAY: - brw_miptree_layout_texture_array(intel, mt); - break; - case GL_TEXTURE_CUBE_MAP: if (intel->gen >= 5) { /* On Ironlake, cube maps are finally represented as just a series of @@ -171,9 +167,10 @@ brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt) brw_miptree_layout_texture_3d(intel, mt); break; - case GL_TEXTURE_2D_ARRAY: case GL_TEXTURE_1D_ARRAY: + case GL_TEXTURE_2D_ARRAY: case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: + case GL_TEXTURE_CUBE_MAP_ARRAY: brw_miptree_layout_texture_array(intel, mt); break; |