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

improved error string

Browse Source
This commit is contained in:
Brian Paul
2002-09-03 18:05:17 +00:00
parent ba88dd0d92
commit b9f75444e6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
/* $Id: teximage.c,v 1.111 2002/07/09 01:22:50 brianp Exp $ */ /* $Id: teximage.c,v 1.112 2002/09/03 18:05:17 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -1212,7 +1212,8 @@ copytexsubimage_error_check( GLcontext *ctx, GLuint dimensions,
teximage = _mesa_select_tex_image(ctx, texUnit, target, level); teximage = _mesa_select_tex_image(ctx, texUnit, target, level);
if (!teximage) { if (!teximage) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,
"glCopyTexSubImage%dD(undefined texture)", dimensions); "glCopyTexSubImage%dD(undefined texture level: %d)",
dimensions, level);
return GL_TRUE; return GL_TRUE;
} }
@@ -1537,6 +1538,8 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
internalFormat = GL_RGBA;
if (is_color_format(internalFormat)) { if (is_color_format(internalFormat)) {
_mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth, _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
&postConvHeight); &postConvHeight);

4
src/mesa/tnl/t_imm_api.c
View File

@@ -1,4 +1,4 @@
/* $Id: t_imm_api.c,v 1.30 2002/06/16 01:09:16 brianp Exp $ */ /* $Id: t_imm_api.c,v 1.31 2002/09/03 18:05:52 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -182,7 +182,7 @@ _tnl_Begin( GLenum mode )
ASSERT (!ctx->CompileFlag); ASSERT (!ctx->CompileFlag);
if (mode > GL_POLYGON) { if (mode > GL_POLYGON) {
_mesa_error( ctx, GL_INVALID_ENUM, "_tnl_Begin" ); _mesa_error( ctx, GL_INVALID_ENUM, "_tnl_Begin(0x%x)", mode );
return; return;
} }