From 0bf7f7fcd2f6a8b5560182520c6832f4467da313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 5 Dec 2020 12:20:07 -0500 Subject: [PATCH] mesa: remove MAX_3D_TEXTURE_LEVELS, MAX_CUBE_TEXTURE_LEVELS they are redundant with MAX_TEXTURE_LEVELS Reviewed-by: Eric Anholt Part-of: --- src/mesa/main/config.h | 8 +------- src/mesa/main/context.c | 12 ++++-------- src/mesa/state_tracker/st_extensions.c | 4 ++-- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index 4ea2e645b67..e72e8d54c66 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -94,15 +94,9 @@ /** Max memory to allow for a single texture image (in megabytes) */ #define MAX_TEXTURE_MBYTES 1024 -/** Number of 1D/2D texture mipmap levels */ +/** Number of texture mipmap levels */ #define MAX_TEXTURE_LEVELS 15 -/** Number of 3D texture mipmap levels */ -#define MAX_3D_TEXTURE_LEVELS 15 - -/** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */ -#define MAX_CUBE_TEXTURE_LEVELS 15 - /** Maximum rectangular texture size - GL_NV_texture_rectangle */ #define MAX_TEXTURE_RECT_SIZE 16384 diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index ca23f5fd1d3..98e189af08a 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -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); diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index a9037a438dc..af6c95ce521 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -92,11 +92,11 @@ void st_init_limits(struct pipe_screen *screen, c->Max3DTextureLevels = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_3D_LEVELS), - MAX_3D_TEXTURE_LEVELS); + MAX_TEXTURE_LEVELS); c->MaxCubeTextureLevels = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS), - MAX_CUBE_TEXTURE_LEVELS); + MAX_TEXTURE_LEVELS); c->MaxTextureRectSize = _min(c->MaxTextureSize, MAX_TEXTURE_RECT_SIZE);