diff options
| author | Marek Olšák <[email protected]> | 2015-08-24 00:22:37 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-09-02 21:06:37 +0100 |
| commit | c759491e8150810dba09fa446e1f5a8e66be2488 (patch) | |
| tree | 2156d173e18e49c12c12557d50c8492df34d4847 /src/mesa | |
| parent | d93f14ec8ec37410b265967876696508dffc9146 (diff) | |
mesa: create multisample fallback textures like normal textures
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.
Cc: 10.6 11.0 <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
(cherry picked from commit f432ae899fb81468778dbeb17ac7615da3ed5c0d)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texstore.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 37c05690091..777466469f8 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; |