Browse Source

improved error string

tags/mesa_4_1
Brian Paul 23 years ago
parent
commit
b9f75444e6
2 changed files with 7 additions and 4 deletions
  1. 5
    2
      src/mesa/main/teximage.c
  2. 2
    2
      src/mesa/tnl/t_imm_api.c

+ 5
- 2
src/mesa/main/teximage.c View File

/* $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
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;
} }


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);

+ 2
- 2
src/mesa/tnl/t_imm_api.c View File

/* $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
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;
} }



Loading…
Cancel
Save