Skip to content

W
wine-winehq
Commit 49cd3aef authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

wined3d: Recognize SM5 vForkInstanceId register.

Signed-off-by: 's avatarJózef Kucia <jkucia@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f21d1b19
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 2 deletions
dlls/wined3d/shader.c
View file @ 49cd3aef
...@@ -1608,6 +1608,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, ...@@ -1608,6 +1608,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer,
shader_addline(buffer, "u"); shader_addline(buffer, "u");
break; break;
case WINED3DSPR_FORKINSTID:
shader_addline(buffer, "vForkInstanceId");
break;
default: default:
shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type);
break; break;
......
dlls/wined3d/shader_sm4.c
View file @ 49cd3aef
...@@ -78,7 +78,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); ...@@ -78,7 +78,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode);
#define WINED3D_SM4_REGISTER_ORDER_MASK (0x3u << WINED3D_SM4_REGISTER_ORDER_SHIFT) #define WINED3D_SM4_REGISTER_ORDER_MASK (0x3u << WINED3D_SM4_REGISTER_ORDER_SHIFT)
#define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 #define WINED3D_SM4_REGISTER_TYPE_SHIFT 12
#define WINED3D_SM4_REGISTER_TYPE_MASK (0xfu << WINED3D_SM4_REGISTER_TYPE_SHIFT) #define WINED3D_SM4_REGISTER_TYPE_MASK (0xffu << WINED3D_SM4_REGISTER_TYPE_SHIFT)
#define WINED3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define WINED3D_SM4_SWIZZLE_TYPE_SHIFT 2
#define WINED3D_SM4_SWIZZLE_TYPE_MASK (0x3u << WINED3D_SM4_SWIZZLE_TYPE_SHIFT) #define WINED3D_SM4_SWIZZLE_TYPE_MASK (0x3u << WINED3D_SM4_SWIZZLE_TYPE_SHIFT)
...@@ -216,7 +216,8 @@ enum wined3d_sm4_register_type ...@@ -216,7 +216,8 @@ enum wined3d_sm4_register_type
WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_PRIMID = 0xb,
WINED3D_SM4_RT_DEPTHOUT = 0xc, WINED3D_SM4_RT_DEPTHOUT = 0xc,
WINED3D_SM4_RT_NULL = 0xd, WINED3D_SM4_RT_NULL = 0xd,
WINED3D_SM5_RT_UAV = 0xe, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17,
WINED3D_SM5_RT_UAV = 0x1e,
}; };
enum wined3d_sm4_output_primitive_type enum wined3d_sm4_output_primitive_type
...@@ -437,6 +438,22 @@ static const enum wined3d_shader_register_type register_type_table[] = ...@@ -437,6 +438,22 @@ static const enum wined3d_shader_register_type register_type_table[] =
/* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID,
/* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT,
/* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
/* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV,
}; };
......
dlls/wined3d/wined3d_private.h
View file @ 49cd3aef
...@@ -367,6 +367,7 @@ enum wined3d_shader_register_type ...@@ -367,6 +367,7 @@ enum wined3d_shader_register_type
WINED3DSPR_NULL, WINED3DSPR_NULL,
WINED3DSPR_RESOURCE, WINED3DSPR_RESOURCE,
WINED3DSPR_UAV, WINED3DSPR_UAV,
WINED3DSPR_FORKINSTID,
}; };
enum wined3d_data_type enum wined3d_data_type
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment