OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: nr_mipmap_levels -> levels

Browse Source 
No need to be so verbose.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig
2019-08-20 15:24:18 -07:00
parent 024f9cf24f
commit 96f6b8a707
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/panfrost/pan_context.c
View File

@@ -2316,7 +2316,7 @@ panfrost_create_sampler_view(
.swizzle = panfrost_translate_swizzle_4(user_swizzle) .swizzle = panfrost_translate_swizzle_4(user_swizzle)
}; };
texture_descriptor.nr_mipmap_levels = last_level - first_level; texture_descriptor.levels = last_level - first_level;
so->hw = texture_descriptor; so->hw = texture_descriptor;

2
src/panfrost/include/panfrost-job.h
View File

@@ -1210,7 +1210,7 @@ struct mali_texture_descriptor {
uint8_t unknown3A; uint8_t unknown3A;
/* Zero for non-mipmapped, (number of levels - 1) for mipmapped */ /* Zero for non-mipmapped, (number of levels - 1) for mipmapped */
uint8_t nr_mipmap_levels; uint8_t levels;
/* Swizzling is a single 32-bit word, broken up here for convenience. /* Swizzling is a single 32-bit word, broken up here for convenience.
* Here, swizzling refers to the ES 3.0 texture parameters for channel * Here, swizzling refers to the ES 3.0 texture parameters for channel

7
src/panfrost/pandecode/decode.c
View File

@@ -1790,9 +1790,10 @@ pandecode_texture(mali_ptr u,
if (t->array_size) if (t->array_size)
pandecode_log_cont("[%u]", t->array_size + 1); pandecode_log_cont("[%u]", t->array_size + 1);
pandecode_log_cont("\n"); if (t->levels)
pandecode_log_cont(" mip %u", t->levels);
pandecode_prop("nr_mipmap_levels = %" PRId8, t->nr_mipmap_levels); pandecode_log_cont("\n");
pandecode_log(".format = {\n"); pandecode_log(".format = {\n");
pandecode_indent++; pandecode_indent++;
@@ -1837,7 +1838,7 @@ pandecode_texture(mali_ptr u,
* properties, but dump extra * properties, but dump extra
* possibilities to futureproof */ * possibilities to futureproof */
int bitmap_count = MALI_NEGATIVE(t->nr_mipmap_levels); int bitmap_count = MALI_NEGATIVE(t->levels);
bool manual_stride = f.usage2 & MALI_TEX_MANUAL_STRIDE; bool manual_stride = f.usage2 & MALI_TEX_MANUAL_STRIDE;
/* Miptree for each face */ /* Miptree for each face */