=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Reject uploads for multisample textures.
Alexandre Julliard
julliard at winehq.org
Tue May 15 16:25:23 CDT 2018
Module: wine
Branch: master
Commit: c05b39e77f24feaca5c0b34a858751cf9e193281
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05b39e77f24feaca5c0b34a858751cf9e193281
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue May 15 10:51:45 2018 +0200
wined3d: Reject uploads for multisample textures.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/texture.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index dadcd03..0b05453 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1919,15 +1919,20 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s
target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx);
level = sub_resource_idx % texture->level_count;
- if (target == GL_TEXTURE_1D_ARRAY)
- {
- dst_y = sub_resource_idx / texture->level_count;
- update_h = 1;
- }
- else if (target == GL_TEXTURE_2D_ARRAY)
+ switch (target)
{
- dst_z = sub_resource_idx / texture->level_count;
- update_d = 1;
+ case GL_TEXTURE_1D_ARRAY:
+ dst_y = sub_resource_idx / texture->level_count;
+ update_h = 1;
+ break;
+ case GL_TEXTURE_2D_ARRAY:
+ dst_z = sub_resource_idx / texture->level_count;
+ update_d = 1;
+ break;
+ case GL_TEXTURE_2D_MULTISAMPLE:
+ case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+ FIXME("Not supported for multisample textures.\n");
+ return;
}
bo.buffer_object = data->buffer_object;
More information about the wine-cvs
mailing list