diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-17 10:55:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-17 10:55:40 +0200 |
| commit | 6d3ef5c3fe5b69e59e3511202db6a66f71c2f234 (patch) | |
| tree | 3830d989b529135e92edb6004aa368f287ed20c5 /mesalib/src/mesa/main | |
| parent | cf506c799c2281867a28ac33ac985994918bc0ba (diff) | |
| parent | 5d9b8cf0e4054e774f906cde9dd6b61ceca72d44 (diff) | |
| download | vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.gz vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.bz2 vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/pack.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index aa8ba1882..792a92da3 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -2564,6 +2564,8 @@ _mesa_GenerateMipmapEXT(GLenum target) srcImage = _mesa_select_tex_image(ctx, texObj, target, texObj->BaseLevel); if (!srcImage) { _mesa_unlock_texture(ctx, texObj); + _mesa_error(ctx, GL_INVALID_OPERATION, + "glGenerateMipmap(zero size base image)"); return; } diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c index 7aebd45ea..4c99199d9 100644 --- a/mesalib/src/mesa/main/pack.c +++ b/mesalib/src/mesa/main/pack.c @@ -926,7 +926,7 @@ _mesa_pack_rgba_span_from_ints(struct gl_context *ctx, GLuint n, GLint rgba[][4] break; case GL_INT: /* No conversion necessary. */ - pack_uint_from_uint_rgba(ctx, dstAddr, dstFormat, rgba, n); + pack_uint_from_uint_rgba(ctx, dstAddr, dstFormat, (GLuint (*)[4]) rgba, n); break; case GL_UNSIGNED_SHORT: pack_ushort_from_int_rgba(ctx, dstAddr, dstFormat, rgba, n); |