On 25 August 2015 at 09:59, Marek Olšák <mar...@gmail.com> wrote: > From: Marek Olšák <marek.ol...@amd.com> > > This works if drivers upsample on upload (like all radeon ones do). > The alternative is an unexpected GL error from anything calling > _mesa_update_state and possibly other issues. > Reviewed-by: Dave Airlie <airl...@redhat.com>
> Cc: 10.6 11.0 <mesa-sta...@lists.freedesktop.org> > --- > src/mesa/main/texstore.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c > index 37c0569..7774664 100644 > --- a/src/mesa/main/texstore.c > +++ b/src/mesa/main/texstore.c > @@ -1004,6 +1004,7 @@ store_texsubimage(struct gl_context *ctx, > /* compute slice info (and do some sanity checks) */ > switch (target) { > case GL_TEXTURE_2D: > + case GL_TEXTURE_2D_MULTISAMPLE: > case GL_TEXTURE_RECTANGLE: > case GL_TEXTURE_CUBE_MAP: > case GL_TEXTURE_EXTERNAL_OES: > @@ -1025,6 +1026,7 @@ store_texsubimage(struct gl_context *ctx, > srcImageStride = _mesa_image_row_stride(packing, width, format, type); > break; > case GL_TEXTURE_2D_ARRAY: > + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: > numSlices = depth; > sliceOffset = zoffset; > depth = 1; > -- > 2.1.4 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev