Module: wine Branch: master Commit: 4235d59d29fa41677079d9012286a7ff18a48705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4235d59d29fa41677079d90122...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon Jan 18 21:16:42 2016 +0100
wined3d: Handle swizzle type equal to 0 as NOSWIZZLE.
Just to silent unnecessary FIXME messages.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/shader_sm4.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 710434b..ae148da 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -175,6 +175,7 @@ enum wined3d_sm4_input_primitive_type
enum wined3d_sm4_swizzle_type { + WINED3D_SM4_SWIZZLE_NONE = 0x0, WINED3D_SM4_SWIZZLE_VEC4 = 0x1, WINED3D_SM4_SWIZZLE_SCALAR = 0x2, }; @@ -725,6 +726,10 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD
switch (swizzle_type) { + case WINED3D_SM4_SWIZZLE_NONE: + src_param->swizzle = WINED3DSP_NOSWIZZLE; + break; + case WINED3D_SM4_SWIZZLE_SCALAR: src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; src_param->swizzle = (src_param->swizzle & 0x3) * 0x55;