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

fix glCopyTexSubImage2D error checking (bug 661907)

Browse Source
This commit is contained in:
Brian Paul
2003-01-08 16:24:05 +00:00
parent 95249b2d18
commit fa268adc9d
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mesa/main/teximage.c
View File

@@ -1,10 +1,10 @@
/* $Id: teximage.c,v 1.124 2002/10/30 19:58:58 brianp Exp $ */ /* $Id: teximage.c,v 1.125 2003/01/08 16:24:05 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 4.1 * Version: 5.1
* *
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -1342,10 +1342,15 @@ copytexsubimage_error_check( GLcontext *ctx, GLuint dimensions,
maxLevels = ctx->Const.MaxTextureLevels; maxLevels = ctx->Const.MaxTextureLevels;
} }
else if (dimensions == 2) { else if (dimensions == 2) {
if (ctx->Extensions.ARB_texture_cube_map) { if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
if ((target < GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB || target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
target > GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) && if (!ctx->Extensions.ARB_texture_cube_map) {
target != GL_TEXTURE_2D) { _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
return GL_TRUE;
}
}
else if (target == GL_TEXTURE_RECTANGLE_NV) {
if (!ctx->Extensions.NV_texture_rectangle) {
_mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" ); _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
return GL_TRUE; return GL_TRUE;
} }
@@ -1354,8 +1359,10 @@ copytexsubimage_error_check( GLcontext *ctx, GLuint dimensions,
_mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" ); _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
return GL_TRUE; return GL_TRUE;
} }
if (target == GL_PROXY_TEXTURE_2D && target == GL_TEXTURE_2D) if (target == GL_TEXTURE_2D)
maxLevels = ctx->Const.MaxTextureLevels; maxLevels = ctx->Const.MaxTextureLevels;
else if (target == GL_TEXTURE_RECTANGLE_NV)
maxLevels = 1;
else else
maxLevels = ctx->Const.MaxCubeTextureLevels; maxLevels = ctx->Const.MaxCubeTextureLevels;
} }