diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/context.c | 18 | 
1 files changed, 13 insertions, 5 deletions
| diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 19ff5e552c..9705fd8a98 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -864,6 +864,9 @@ _mesa_init_constants(GLcontext *ctx)     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((1 << (MAX_TEXTURE_LEVELS - 1)) <= MAX_WIDTH); +     /* Constants, may be overriden (usually only reduced) by device drivers */     ctx->Const.MaxTextureLevels = MAX_TEXTURE_LEVELS;     ctx->Const.Max3DTextureLevels = MAX_3D_TEXTURE_LEVELS; @@ -960,13 +963,18 @@ check_context_limits(GLcontext *ctx)     /* number of coord units cannot be greater than number of image units */     assert(ctx->Const.MaxTextureCoordUnits <= ctx->Const.MaxTextureImageUnits); -   assert(ctx->Const.MaxViewportWidth <= MAX_WIDTH); -   assert(ctx->Const.MaxViewportHeight <= MAX_WIDTH); +   assert(ctx->Const.MaxTextureLevels <= MAX_TEXTURE_LEVELS); +   assert(ctx->Const.Max3DTextureLevels <= MAX_3D_TEXTURE_LEVELS); +   assert(ctx->Const.MaxCubeTextureLevels <= MAX_CUBE_TEXTURE_LEVELS); +   assert(ctx->Const.MaxTextureRectSize <= MAX_TEXTURE_RECT_SIZE);     /* make sure largest texture image is <= MAX_WIDTH in size */ -   assert((1 << (ctx->Const.MaxTextureLevels -1 )) <= MAX_WIDTH); -   assert((1 << (ctx->Const.MaxCubeTextureLevels -1 )) <= MAX_WIDTH); -   assert((1 << (ctx->Const.Max3DTextureLevels -1 )) <= MAX_WIDTH); +   assert((1 << (ctx->Const.MaxTextureLevels - 1)) <= MAX_WIDTH); +   assert((1 << (ctx->Const.MaxCubeTextureLevels - 1)) <= MAX_WIDTH); +   assert((1 << (ctx->Const.Max3DTextureLevels - 1)) <= MAX_WIDTH); + +   assert(ctx->Const.MaxViewportWidth <= MAX_WIDTH); +   assert(ctx->Const.MaxViewportHeight <= MAX_WIDTH);     assert(ctx->Const.MaxDrawBuffers <= MAX_DRAW_BUFFERS); | 
