=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Do not try to create texture views for depth slices.
Alexandre Julliard
julliard at winehq.org
Fri Dec 9 13:37:33 CST 2016
Module: wine
Branch: master
Commit: b76f39936f8ae3da33c29424477ca0ba817822c8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f39936f8ae3da33c29424477ca0ba817822c8
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Dec 9 11:30:44 2016 +0100
wined3d: Do not try to create texture views for depth slices.
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 | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 237122d..27ee9d2 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -65,6 +65,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target
const struct wined3d_format *view_format)
{
const struct wined3d_gl_info *gl_info;
+ unsigned int layer_idx, layer_count;
struct wined3d_context *context;
struct gl_texture *gl_texture;
@@ -83,10 +84,19 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target
wined3d_texture_prepare_texture(texture, context, FALSE);
gl_texture = wined3d_texture_get_gl_texture(texture, FALSE);
+ layer_idx = desc->u.texture.layer_idx;
+ layer_count = desc->u.texture.layer_count;
+ if (view_target == GL_TEXTURE_3D && (layer_idx || layer_count != 1))
+ {
+ FIXME("Depth slice (%u-%u) not supported.\n", layer_idx, layer_count);
+ layer_idx = 0;
+ layer_count = 1;
+ }
+
gl_info->gl_ops.gl.p_glGenTextures(1, &view->name);
GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal,
desc->u.texture.level_idx, desc->u.texture.level_count,
- desc->u.texture.layer_idx, desc->u.texture.layer_count));
+ layer_idx, layer_count));
checkGLcall("Create texture view");
if (is_stencil_view_format(view_format))
More information about the wine-cvs
mailing list