[Mesa-dev] [PATCH 5/7] mesa: Make TexImage error cases about internalFormat more informative.

[Eric Anholt]

Ian Romanick <idr at freedesktop.org> writes:

> On 02/11/2014 05:11 PM, Eric Anholt wrote:
>> I tripped over one of these when debugging meta, and it's a lot nicer to
>> just see the internalFormat being complained about.
>> ---
>>  src/mesa/main/teximage.c | 19 ++++++++++++-------
>>  1 file changed, 12 insertions(+), 7 deletions(-)
>> 
>> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
>> index 5938f50..46b006d 100644
>> --- a/src/mesa/main/teximage.c
>> +++ b/src/mesa/main/teximage.c
>> @@ -2244,9 +2244,10 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
>>  
>>     /* This will detect any invalid internalFormat value */
>>     if (!_mesa_is_compressed_format(ctx, internalFormat)) {
>> -      reason = "internalFormat";
>> -      error = GL_INVALID_ENUM;
>> -      goto error;
>> +      _mesa_error(ctx, GL_INVALID_ENUM,
>> +                  "glCompressedTexImage%dD(internalFormat=%s)",
>> +                  dimensions, _mesa_lookup_enum_by_nr(internalFormat));
>> +      return GL_TRUE;
>
> The only thing I don't like about this is now this is the only error
> path in this function that just returns.  All of the others goto error.
>  Maybe toss a comment after the error label like, "Don't put any clean
> up here because not all paths exit here."

Added to the bottom:

+   /* Note: not all error paths exit through here. */
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140211/e54bcadd/attachment.pgp>