Skip to content

W
wine-winehq
Commit 27dc41d0 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Fix the source swizzle for WINED3DSIH_LOG and WINED3DSIH_LOGP.

parent 2fe08ed6
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 15 deletions
dlls/d3d8/tests/visual.c
View file @ 27dc41d0
...@@ -1774,16 +1774,15 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) ...@@ -1774,16 +1774,15 @@ static void test_scalar_instructions(IDirect3DDevice8 *device)
const char *name; const char *name;
const DWORD *byte_code; const DWORD *byte_code;
D3DCOLOR color; D3DCOLOR color;
BOOL todo;
} }
test_data[] = test_data[] =
{ {
{"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80), FALSE}, {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80)},
{"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4), FALSE}, {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4)},
{"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40)},
{"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40)},
{"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)},
{"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)},
}; };
unsigned int i; unsigned int i;
DWORD shader; DWORD shader;
...@@ -1808,13 +1807,8 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) ...@@ -1808,13 +1807,8 @@ static void test_scalar_instructions(IDirect3DDevice8 *device)
ok(SUCCEEDED(hr), "%s: Failed to end scene, hr %#x.\n", test_data[i].name, hr); ok(SUCCEEDED(hr), "%s: Failed to end scene, hr %#x.\n", test_data[i].name, hr);
color = getPixelColor(device, 320, 240); color = getPixelColor(device, 320, 240);
if (test_data[i].todo) ok(color_match(color, test_data[i].color, 4), "%s: Got unexpected color 0x%08x, expected 0x%08x.\n",
todo_wine ok(color_match(color, test_data[i].color, 4), test_data[i].name, color, test_data[i].color);
"%s: Got unexpected color 0x%08x, expected 0x%08x.\n",
test_data[i].name, color, test_data[i].color);
else
ok(color_match(color, test_data[i].color, 4), "%s: Got unexpected color 0x%08x, expected 0x%08x.\n",
test_data[i].name, color, test_data[i].color);
hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);
ok(SUCCEEDED(hr), "%s: Failed to present, hr %#x.\n", test_data[i].name, hr); ok(SUCCEEDED(hr), "%s: Failed to present, hr %#x.\n", test_data[i].name, hr);
......
dlls/wined3d/glsl_shader.c
View file @ 27dc41d0
...@@ -2601,7 +2601,7 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) ...@@ -2601,7 +2601,7 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins)
dst_write_mask = shader_glsl_append_dst(buffer, ins); dst_write_mask = shader_glsl_append_dst(buffer, ins);
dst_size = shader_glsl_get_write_mask_size(dst_write_mask); dst_size = shader_glsl_get_write_mask_size(dst_write_mask);
shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param);
if (dst_size > 1) if (dst_size > 1)
{ {
......
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