fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965: Rename MIPTREE_LAYOUT_ALLOC_* -> MIPTREE_LAYOUT_TILING_*.

Browse source 
Ben suggested that I rename MIPTREE_LAYOUT_ALLOC_ANY_TILED since it
needed to include no tiling at all, but the name
MIPTREE_LAYOUT_ALLOC_ANY is pretty nondescriptive. We can avoid
confusion by replacing "ALLOC" with "TILING" in the identifiers.

Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Matt Turner 2015-08-06 10:59:15 -07:00
parent 1c175fc2e3
commit 9f78e27fc6
7 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/dri/i965/brw_tex_layout.c
View file

@ -630,12 +630,12 @@ brw_miptree_choose_tiling(struct brw_context *brw,
/* Some usages may want only one type of tiling, like depth miptrees (Y /* Some usages may want only one type of tiling, like depth miptrees (Y
* tiled), or temporary BOs for uploading data once (linear). * tiled), or temporary BOs for uploading data once (linear).
*/ */
switch (layout_flags & MIPTREE_LAYOUT_ALLOC_ANY_TILED) { switch (layout_flags & MIPTREE_LAYOUT_TILING_ANY) {
case MIPTREE_LAYOUT_ALLOC_ANY_TILED: case MIPTREE_LAYOUT_TILING_ANY:
break; break;
case MIPTREE_LAYOUT_ALLOC_YTILED: case MIPTREE_LAYOUT_TILING_Y:
return I915_TILING_Y; return I915_TILING_Y;
case MIPTREE_LAYOUT_ALLOC_LINEAR: case MIPTREE_LAYOUT_TILING_NONE:
return I915_TILING_NONE; return I915_TILING_NONE;
} }

2
src/mesa/drivers/dri/i965/intel_fbo.c
View file

@ -1023,7 +1023,7 @@ intel_renderbuffer_move_to_temp(struct brw_context *brw,
int width, height, depth; int width, height, depth;
uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD | uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD |
MIPTREE_LAYOUT_ALLOC_ANY_TILED; MIPTREE_LAYOUT_TILING_ANY;
intel_miptree_get_dimensions_for_image(rb->TexImage, &width, &height, &depth); intel_miptree_get_dimensions_for_image(rb->TexImage, &width, &height, &depth);

16
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -455,7 +455,7 @@ intel_miptree_create_layout(struct brw_context *brw,
uint32_t stencil_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD; uint32_t stencil_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD;
if (brw->gen == 6) { if (brw->gen == 6) {
stencil_flags |= MIPTREE_LAYOUT_FORCE_ALL_SLICE_AT_LOD | stencil_flags |= MIPTREE_LAYOUT_FORCE_ALL_SLICE_AT_LOD |
MIPTREE_LAYOUT_ALLOC_ANY_TILED; MIPTREE_LAYOUT_TILING_ANY;
} }
mt->stencil_mt = intel_miptree_create(brw, mt->stencil_mt = intel_miptree_create(brw,
@ -759,8 +759,8 @@ intel_miptree_create_for_bo(struct brw_context *brw,
/* The BO already has a tiling format and we shouldn't confuse the lower /* The BO already has a tiling format and we shouldn't confuse the lower
* layers by making it try to find a tiling format again. * layers by making it try to find a tiling format again.
*/ */
assert((layout_flags & MIPTREE_LAYOUT_ALLOC_ANY_TILED) == 0); assert((layout_flags & MIPTREE_LAYOUT_TILING_ANY) == 0);
assert((layout_flags & MIPTREE_LAYOUT_ALLOC_LINEAR) == 0); assert((layout_flags & MIPTREE_LAYOUT_TILING_NONE) == 0);
layout_flags |= MIPTREE_LAYOUT_FOR_BO; layout_flags |= MIPTREE_LAYOUT_FOR_BO;
mt = intel_miptree_create_layout(brw, target, format, mt = intel_miptree_create_layout(brw, target, format,
@ -874,7 +874,7 @@ intel_miptree_create_for_renderbuffer(struct brw_context *brw,
bool ok; bool ok;
GLenum target = num_samples > 1 ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D; GLenum target = num_samples > 1 ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D;
const uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD | const uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD |
MIPTREE_LAYOUT_ALLOC_ANY_TILED; MIPTREE_LAYOUT_TILING_ANY;
mt = intel_miptree_create(brw, target, format, 0, 0, mt = intel_miptree_create(brw, target, format, 0, 0,
@ -1385,7 +1385,7 @@ intel_miptree_alloc_mcs(struct brw_context *brw,
* "The MCS surface must be stored as Tile Y." * "The MCS surface must be stored as Tile Y."
*/ */
const uint32_t mcs_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD | const uint32_t mcs_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD |
MIPTREE_LAYOUT_ALLOC_YTILED; MIPTREE_LAYOUT_TILING_Y;
mt->mcs_mt = intel_miptree_create(brw, mt->mcs_mt = intel_miptree_create(brw,
mt->target, mt->target,
format, format,
@ -1444,7 +1444,7 @@ intel_miptree_alloc_non_msrt_mcs(struct brw_context *brw,
ALIGN(mt->logical_height0, height_divisor) / height_divisor; ALIGN(mt->logical_height0, height_divisor) / height_divisor;
assert(mt->logical_depth0 == 1); assert(mt->logical_depth0 == 1);
uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD | uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD |
MIPTREE_LAYOUT_ALLOC_YTILED; MIPTREE_LAYOUT_TILING_Y;
if (brw->gen >= 8) { if (brw->gen >= 8) {
layout_flags |= MIPTREE_LAYOUT_FORCE_HALIGN16; layout_flags |= MIPTREE_LAYOUT_FORCE_HALIGN16;
} }
@ -1709,7 +1709,7 @@ intel_hiz_miptree_buf_create(struct brw_context *brw,
if (!buf) if (!buf)
return NULL; return NULL;
layout_flags |= MIPTREE_LAYOUT_ALLOC_ANY_TILED; layout_flags |= MIPTREE_LAYOUT_TILING_ANY;
buf->mt = intel_miptree_create(brw, buf->mt = intel_miptree_create(brw,
mt->target, mt->target,
mt->format, mt->format,
@ -2149,7 +2149,7 @@ intel_miptree_map_blit(struct brw_context *brw,
map->mt = intel_miptree_create(brw, GL_TEXTURE_2D, mt->format, map->mt = intel_miptree_create(brw, GL_TEXTURE_2D, mt->format,
0, 0, 0, 0,
map->w, map->h, 1, map->w, map->h, 1,
0, MIPTREE_LAYOUT_ALLOC_LINEAR); 0, MIPTREE_LAYOUT_TILING_NONE);
if (!map->mt) { if (!map->mt) {
fprintf(stderr, "Failed to allocate blit temporary\n"); fprintf(stderr, "Failed to allocate blit temporary\n");

8
src/mesa/drivers/dri/i965/intel_mipmap_tree.h
View file

@ -536,10 +536,10 @@ enum {
MIPTREE_LAYOUT_DISABLE_AUX = 1 << 3, MIPTREE_LAYOUT_DISABLE_AUX = 1 << 3,
MIPTREE_LAYOUT_FORCE_HALIGN16 = 1 << 4, MIPTREE_LAYOUT_FORCE_HALIGN16 = 1 << 4,
MIPTREE_LAYOUT_ALLOC_YTILED = 1 << 5, MIPTREE_LAYOUT_TILING_Y = 1 << 5,
MIPTREE_LAYOUT_ALLOC_LINEAR = 1 << 6, MIPTREE_LAYOUT_TILING_NONE = 1 << 6,
MIPTREE_LAYOUT_ALLOC_ANY_TILED = MIPTREE_LAYOUT_ALLOC_YTILED | MIPTREE_LAYOUT_TILING_ANY = MIPTREE_LAYOUT_TILING_Y |
MIPTREE_LAYOUT_ALLOC_LINEAR, MIPTREE_LAYOUT_TILING_NONE,
}; };
struct intel_mipmap_tree *intel_miptree_create(struct brw_context *brw, struct intel_mipmap_tree *intel_miptree_create(struct brw_context *brw,

2
src/mesa/drivers/dri/i965/intel_tex.c
View file

@ -145,7 +145,7 @@ intel_alloc_texture_storage(struct gl_context *ctx,
0, levels - 1, 0, levels - 1,
width, height, depth, width, height, depth,
num_samples, num_samples,
MIPTREE_LAYOUT_ALLOC_ANY_TILED); MIPTREE_LAYOUT_TILING_ANY);
if (intel_texobj->mt == NULL) { if (intel_texobj->mt == NULL) {
return false; return false;

2
src/mesa/drivers/dri/i965/intel_tex_image.c
View file

@ -80,7 +80,7 @@ intel_miptree_create_for_teximage(struct brw_context *brw,
height, height,
depth, depth,
intelImage->base.Base.NumSamples, intelImage->base.Base.NumSamples,
layout_flags | MIPTREE_LAYOUT_ALLOC_ANY_TILED); layout_flags | MIPTREE_LAYOUT_TILING_ANY);
} }
static void static void

2
src/mesa/drivers/dri/i965/intel_tex_validate.c
View file

@ -137,7 +137,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
width, height, depth, validate_last_level + 1); width, height, depth, validate_last_level + 1);
const uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD | const uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD |
MIPTREE_LAYOUT_ALLOC_ANY_TILED; MIPTREE_LAYOUT_TILING_ANY;
intelObj->mt = intel_miptree_create(brw, intelObj->mt = intel_miptree_create(brw,
intelObj->base.Target, intelObj->base.Target,
firstImage->base.Base.TexFormat, firstImage->base.Base.TexFormat,