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

mesa: remove MAX_3D_TEXTURE_LEVELS, MAX_CUBE_TEXTURE_LEVELS

Browse Source 
they are redundant with MAX_TEXTURE_LEVELS

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7956>
This commit is contained in:
Marek Olšák
2020-12-05 12:20:07 -05:00
committed by Marge Bot
parent 0ef61a162a
commit 0bf7f7fcd2
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/main/context.c
View File

@@ -551,8 +551,8 @@ _mesa_init_constants(struct gl_constants *consts, gl_api api)
/* Constants, may be overriden (usually only reduced) by device drivers */
consts->MaxTextureMbytes = MAX_TEXTURE_MBYTES;
consts->MaxTextureSize = 1 << (MAX_TEXTURE_LEVELS - 1);
consts->Max3DTextureLevels = MAX_3D_TEXTURE_LEVELS;
consts->MaxCubeTextureLevels = MAX_CUBE_TEXTURE_LEVELS;
consts->Max3DTextureLevels = MAX_TEXTURE_LEVELS;
consts->MaxCubeTextureLevels = MAX_TEXTURE_LEVELS;
consts->MaxTextureRectSize = MAX_TEXTURE_RECT_SIZE;
consts->MaxArrayTextureLayers = MAX_ARRAY_TEXTURE_LAYERS;
consts->MaxTextureCoordUnits = MAX_TEXTURE_COORD_UNITS;
@@ -793,14 +793,10 @@ check_context_limits(struct gl_context *ctx)
/* Texture size checks */
assert(ctx->Const.MaxTextureSize <= (1 << (MAX_TEXTURE_LEVELS - 1)));
assert(ctx->Const.Max3DTextureLevels <= MAX_3D_TEXTURE_LEVELS);
assert(ctx->Const.MaxCubeTextureLevels <= MAX_CUBE_TEXTURE_LEVELS);
assert(ctx->Const.Max3DTextureLevels <= MAX_TEXTURE_LEVELS);
assert(ctx->Const.MaxCubeTextureLevels <= MAX_TEXTURE_LEVELS);
assert(ctx->Const.MaxTextureRectSize <= MAX_TEXTURE_RECT_SIZE);
/* Texture level checks */
assert(MAX_TEXTURE_LEVELS >= MAX_3D_TEXTURE_LEVELS);
assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS);
/* Max texture size should be <= max viewport size (render to texture) */
assert(ctx->Const.MaxTextureSize <= ctx->Const.MaxViewportWidth);
assert(ctx->Const.MaxTextureSize <= ctx->Const.MaxViewportHeight);