=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Allow creating shader resource views for cube map and rectangle textures.

Alexandre Julliard julliard at winehq.org
Mon Mar 27 15:26:07 CDT 2017


Module: wine
Branch: master
Commit: 16e22c8a6b4f207915c1a0ac517b0105fb48281b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=16e22c8a6b4f207915c1a0ac517b0105fb48281b

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Fri Mar 24 17:14:44 2017 +0100

wined3d: Allow creating shader resource views for cube map and rectangle 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/view.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index ac558a4..82fac25 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -44,13 +44,15 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info,
     }
     view_types[] =
     {
-        {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_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},
     };
     unsigned int i;
 




More information about the wine-cvs mailing list