=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Avoid FIXME() message for unhandled cube map arrays.
Alexandre Julliard
julliard at winehq.org
Wed Mar 8 16:01:39 CST 2017
Module: wine
Branch: master
Commit: 9cb650a3b82ffa5f11f72c56948a11f9b679c21b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb650a3b82ffa5f11f72c56948a11f9b679c21b
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Mar 8 12:07:21 2017 +0100
wined3d: Avoid FIXME() message for unhandled cube map arrays.
There are no GLSL functions with the type part for cube map array
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/glsl_shader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index e43a78b..490fcbf 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -3206,7 +3206,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context
type_part = resource_type_info[resource_type].type_part;
if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect)
type_part = "2DRect";
- if (!type_part[0])
+ if (!type_part[0] && resource_type != WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY)
FIXME("Unhandled resource type %#x.\n", resource_type);
if (!lod && grad && !shader_glsl_has_core_grad(gl_info, &ctx->shader->reg_maps.shader_version))
More information about the wine-cvs
mailing list