=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Add support for multisample texture views.
Alexandre Julliard
julliard at winehq.org
Tue Feb 6 15:55:51 CST 2018
Module: wine
Branch: master
Commit: 7cdf7f56096b97cc4a1e2c5265bf540b845a9e65
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cdf7f56096b97cc4a1e2c5265bf540b845a9e65
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Feb 6 11:40:05 2018 +0100
wined3d: Add support for multisample texture views.
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/view.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index a8e0259..b06dacc 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -44,15 +44,21 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info,
}
view_types[] =
{
- {GL_TEXTURE_CUBE_MAP, 0, GL_TEXTURE_CUBE_MAP},
- {GL_TEXTURE_RECTANGLE, 0, GL_TEXTURE_RECTANGLE},
- {GL_TEXTURE_2D, 0, GL_TEXTURE_2D},
- {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY},
- {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D},
- {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY},
- {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP},
- {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY},
- {GL_TEXTURE_3D, 0, GL_TEXTURE_3D},
+ {GL_TEXTURE_CUBE_MAP, 0, GL_TEXTURE_CUBE_MAP},
+ {GL_TEXTURE_RECTANGLE, 0, GL_TEXTURE_RECTANGLE},
+ {GL_TEXTURE_3D, 0, GL_TEXTURE_3D},
+
+ {GL_TEXTURE_2D, 0, GL_TEXTURE_2D},
+ {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY},
+ {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D},
+ {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY},
+ {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP},
+ {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY},
+
+ {GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_2D_MULTISAMPLE},
+ {GL_TEXTURE_2D_MULTISAMPLE, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY},
+ {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, 0, GL_TEXTURE_2D_MULTISAMPLE},
+ {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY},
};
unsigned int i;
More information about the wine-cvs
mailing list