wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Stefan Dösinger : wined3d: Put some ARB declarations in the right place.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 2f3faf452646b8d249aeb827acdbc3d33fb54a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3faf452646b8d249aeb827a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 12:58:02 2009 +0200 wined3d: Put some ARB declarations in the right place. TMP_POS is only used in vertex shaders, declare it in the vshader specific code. The sRGB constants are only used by pixel shaders, so move them to the ps specific code, and avoid reading the stateblock. --- dlls/wined3d/arb_program_shader.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d0382bb..1a10355 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -328,7 +328,6 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, DWORD *lconst_map) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; DWORD i, cur, next_local = 0; char pshader = shader_is_pshader_version(reg_maps->shader_version.type); unsigned max_constantsF; @@ -352,8 +351,6 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh } else { max_constantsF = GL_LIMITS(vshader_constantsF) - 1; } - /* Temporary Output register */ - shader_addline(buffer, "TEMP TMP_OUT;\n"); } for(i = 0; i < This->baseShader.limits.temporary; i++) { @@ -373,13 +370,6 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh } } - if(device->stateBlock->renderState[WINED3DRS_SRGBWRITEENABLE] && pshader) { - shader_addline(buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", - srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); - shader_addline(buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", - srgb_sub_high, 0.0, 0.0, 0.0); - } - /* Load local constants using the program-local space, * this avoids reloading them each time the shader is used */ @@ -2097,6 +2087,13 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } } + if(args->srgb_correction) { + shader_addline(buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", + srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); + shader_addline(buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", + srgb_sub_high, 0.0, 0.0, 0.0); + } + /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); @@ -2168,6 +2165,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, priv_ctx.target_version = ARB; } + shader_addline(buffer, "TEMP TMP_OUT;\n"); if(need_helper_const(gl_info)) { shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); }

1 0

Stefan Dösinger : wined3d: Get rid of Tx hardcoding in texbem.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: f484cbbf916ed80a4f79fbe61d8a7902c900343b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f484cbbf916ed80a4f79fbe61… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 9 01:05:46 2009 +0200 wined3d: Get rid of Tx hardcoding in texbem. --- dlls/wined3d/arb_program_shader.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e2d6793..d0382bb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1311,9 +1311,8 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->ctx->shader; const struct wined3d_shader_dst_param *dst = &ins->dst[0]; - DWORD src = ins->src[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; - char reg_coord[40], dst_reg[50]; + char reg_coord[40], dst_reg[50], src_reg[50]; DWORD reg_dest_code; /* All versions have a destination register. The Tx where the texture coordinates come @@ -1321,15 +1320,16 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) */ reg_dest_code = dst->reg.idx; shader_arb_get_dst_param(ins, &ins->dst[0], dst_reg); + shader_arb_get_src_param(ins, &ins->src[0], 0, src_reg); sprintf(reg_coord, "fragment.texcoord[%u]", reg_dest_code); /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed * The Tx in which the perturbation map is stored is the tempreg incarnation of the texture register */ shader_addline(buffer, "SWZ TB, bumpenvmat%d, x, z, 0, 0;\n", reg_dest_code); - shader_addline(buffer, "DP3 TA.x, TB, T%u;\n", src); + shader_addline(buffer, "DP3 TA.x, TB, %s;\n", src_reg); shader_addline(buffer, "SWZ TB, bumpenvmat%d, y, w, 0, 0;\n", reg_dest_code); - shader_addline(buffer, "DP3 TA.y, TB, T%u;\n", src); + shader_addline(buffer, "DP3 TA.y, TB, %s;\n", src_reg); /* with projective textures, texbem only divides the static texture coord, not the displacement, * so we can't let the GL handle this. @@ -1347,8 +1347,9 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) if (ins->handler_idx == WINED3DSIH_TEXBEML) { - shader_addline(buffer, "MAD TA, T%u.z, luminance%d.x, luminance%d.y;\n", - src, reg_dest_code, reg_dest_code); + /* No src swizzles are allowed, so this is ok */ + shader_addline(buffer, "MAD TA, %s.z, luminance%d.x, luminance%d.y;\n", + src_reg, reg_dest_code, reg_dest_code); shader_addline(buffer, "MUL %s, %s, TA;\n", dst_reg, dst_reg); } }

1 0

Stefan Dösinger : wined3d: Replace a few hardcoded Tx registers with proper name getters.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: da1b8d0c8e3be000a46f50d5489feb5f0203e7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1b8d0c8e3be000a46f50d54… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 12 20:09:49 2009 +0200 wined3d: Replace a few hardcoded Tx registers with proper name getters. --- dlls/wined3d/arb_program_shader.c | 82 ++++++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a0cb635..e2d6793 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1241,18 +1241,20 @@ static void pshader_hw_texcoord(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); + char dst_str[50]; - char tmp[20]; - shader_arb_get_write_mask(ins, dst, tmp); - if (shader_version != WINED3D_SHADER_VERSION(1,4)) + if (shader_version < WINED3D_SHADER_VERSION(1,4)) { DWORD reg = dst->reg.idx; - shader_addline(buffer, "MOV_SAT T%u%s, fragment.texcoord[%u];\n", reg, tmp, reg); + + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); + shader_addline(buffer, "MOV_SAT %s, fragment.texcoord[%u];\n", dst_str, reg); } else { char reg_src[40]; shader_arb_get_src_param(ins, &ins->src[0], 0, reg_src); - shader_addline(buffer, "MOV R%u%s, %s;\n", dst->reg.idx, tmp, reg_src); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); + shader_addline(buffer, "MOV %s, %s;\n", dst_str, reg_src); } } @@ -1355,13 +1357,17 @@ static void pshader_hw_texm3x2pad(const struct wined3d_shader_instruction *ins) { DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; - char src0_name[50]; + char src0_name[50], dst_name[50]; + BOOL is_color; + struct wined3d_shader_register tmp_reg = ins->dst[0].reg; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); /* The next instruction will be a texm3x2tex or texm3x2depth that writes to the uninitialized * T<reg+1> register. Use this register to store the calculated vector */ - shader_addline(buffer, "DP3 T%u.x, fragment.texcoord[%u], %s;\n", reg + 1, reg, src0_name); + tmp_reg.idx = reg + 1; + shader_arb_get_register_name(ins, &tmp_reg, dst_name, &is_color); + shader_addline(buffer, "DP3 %s.x, fragment.texcoord[%u], %s;\n", dst_name, reg, src0_name); } static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) @@ -1374,9 +1380,10 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) char dst_str[50]; char src0_name[50]; char dst_reg[50]; + BOOL is_color; /* We know that we're writing to the uninitialized T<reg> register, so use it for temporary storage */ - sprintf(dst_reg, "T%u", reg); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_reg, &is_color); shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); @@ -1391,17 +1398,20 @@ static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; - char src0_name[50]; - unsigned int dst; + char src0_name[50], dst_name[50]; + struct wined3d_shader_register tmp_reg = ins->dst[0].reg; + BOOL is_color; /* There are always 2 texm3x3pad instructions followed by one texm3x3[tex,vspec, ...] instruction, with * incrementing ins->dst[0].register_idx numbers. So the pad instruction already knows the final destination * register, and this register is uninitialized(otherwise the assembler complains that it is 'redeclared') */ - dst = reg + 2 - current_state->current_row; + tmp_reg.idx = reg + 2 - current_state->current_row; + shader_arb_get_register_name(ins, &tmp_reg, dst_name, &is_color); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 T%u.%c, fragment.texcoord[%u], %s;\n", dst, 'x' + current_state->current_row, reg, src0_name); + shader_addline(buffer, "DP3 %s%u.%c, fragment.texcoord[%u], %s;\n", + dst_name, tmp_reg.idx, 'x' + current_state->current_row, reg, src0_name); current_state->texcoord_w[current_state->current_row++] = reg; } @@ -1414,17 +1424,17 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[50]; - char dst_reg[8]; - char src0_name[50]; + char src0_name[50], dst_name[50]; + BOOL is_color; - sprintf(dst_reg, "T%u", reg); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_name, &is_color); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_name, reg, src0_name); /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1439,11 +1449,12 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins char dst_str[50]; char src0_name[50]; char dst_reg[8]; + BOOL is_color; /* Get the dst reg without writemask strings. We know this register is uninitialized, so we can use all * components for temporary data storage */ - sprintf(dst_reg, "T%u", reg); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_reg, &is_color); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); @@ -1481,18 +1492,19 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) char src0_name[50]; char src1_name[50]; char dst_reg[8]; + BOOL is_color; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_arb_get_src_param(ins, &ins->src[0], 1, src1_name); - /* Note: TMP.xy is input here, generated by two texm3x3pad instructions */ - sprintf(dst_reg, "T%u", reg); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_reg, &is_color); + /* Note: dst_reg.xy is input here, generated by two texm3x3pad instructions */ shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); /* Calculate reflection vector. * - * dot(N, E) - * TMP.xyz = 2 * --------- * N - E - * dot(N, N) + * dot(N, E) + * dst_reg.xyz = 2 * --------- * N - E + * dot(N, N) * * Which normalizes the normal vector */ @@ -1577,13 +1589,15 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_str[50]; + char dst_str[50], dst_name[50]; char src0[50]; + BOOL is_color; shader_arb_get_dst_param(ins, dst, dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 T%u.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, dst->reg.idx, src0); - shader_addline(buffer, "MOV %s, T%u;\n", dst_str, dst->reg.idx); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_name, &is_color); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_name, dst->reg.idx, src0); + shader_addline(buffer, "MOV %s, %s;\n", dst_str, dst_name); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB: @@ -1594,20 +1608,22 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) static void pshader_hw_texm3x2depth(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; - DWORD dst_reg = ins->dst[0].reg.idx; - char src0[50]; + const struct wined3d_shader_dst_param *dst = &ins->dst[0]; + char src0[50], dst_name[50]; + BOOL is_color; shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 T%u.y, fragment.texcoord[%u], %s;\n", dst_reg, dst_reg, src0); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_name, &is_color); + shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_name, dst->reg.idx, src0); /* How to deal with the special case dst_name.g == 0? if r != 0, then * the r * (1 / 0) will give infinity, which is clamped to 1.0, the correct * result. But if r = 0.0, then 0 * inf = 0, which is incorrect. */ - shader_addline(buffer, "RCP T%u.y, T%u.y;\n", dst_reg, dst_reg); - shader_addline(buffer, "MUL T%u.x, T%u.x, T%u.y;\n", dst_reg, dst_reg, dst_reg); - shader_addline(buffer, "MIN T%u.x, T%u.x, one.x;\n", dst_reg, dst_reg); - shader_addline(buffer, "MAX result.depth, T%u.x, 0.0;\n", dst_reg); + shader_addline(buffer, "RCP %s.y, %s.y;\n", dst_name, dst_name); + shader_addline(buffer, "MUL %s.x, %s.x, %s.y;\n", dst_name, dst_name, dst_name); + shader_addline(buffer, "MIN %s.x, %s.x, one.x;\n", dst_name, dst_name); + shader_addline(buffer, "MAX result.depth, %s.x, 0.0;\n", dst_name); } /** Handles transforming all WINED3DSIO_M?x? opcodes for

1 0

Stefan Dösinger : wined3d: Implement DSX in ARB.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 7fc4279cb8d9fe3bb11a5b737a92f4cafc8c96ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc4279cb8d9fe3bb11a5b737… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 8 18:17:58 2009 +0200 wined3d: Implement DSX in ARB. DSY is not that easy because we have to deal with the inverted coordinate system in onscreen(!) rendering - see GLSL dsy. --- dlls/wined3d/arb_program_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e3abdf..a0cb635 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1039,6 +1039,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_SUB: instruction = "SUB"; break; case WINED3DSIH_MOVA:instruction = "ARR"; break; case WINED3DSIH_SGN: instruction = "SSG"; break; + case WINED3DSIH_DSX: instruction = "DDX"; break; default: instruction = ""; FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; @@ -2354,7 +2355,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DP3 */ shader_hw_map2gl, /* WINED3DSIH_DP4 */ shader_hw_map2gl, /* WINED3DSIH_DST */ shader_hw_map2gl, - /* WINED3DSIH_DSX */ NULL, + /* WINED3DSIH_DSX */ shader_hw_map2gl, /* WINED3DSIH_DSY */ NULL, /* WINED3DSIH_ELSE */ NULL, /* WINED3DSIH_ENDIF */ NULL,

1 0

Louis Lenders : d3d9/tests: Add simple test to show that QualityLevels is not zero, when we call CheckDeviceMultiSampleType with D3DMULTISAMPLE_NONE.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: f9b9f73991d5ac5e8db5a27f7c4ed9c69459cc3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b9f73991d5ac5e8db5a27f7… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue May 26 21:47:50 2009 +0000 d3d9/tests: Add simple test to show that QualityLevels is not zero, when we call CheckDeviceMultiSampleType with D3DMULTISAMPLE_NONE. --- dlls/d3d9/tests/device.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e4ab592..22f4234 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -136,6 +136,56 @@ static void test_mipmap_levels(void) DestroyWindow( hwnd ); } +static void test_checkdevicemultisampletype(void) +{ + + HRESULT hr; + HWND hwnd = NULL; + + IDirect3D9 *pD3d = NULL; + IDirect3DDevice9 *pDevice = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + DWORD qualityLevels; + + pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to create IDirect3D9Device (%08x)\n", hr); + if (FAILED(hr)) { + skip("failed to create a d3d device\n"); + goto cleanup; + } + + qualityLevels = 0; + + hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, + D3DMULTISAMPLE_NONE, &qualityLevels); + ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); + todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + + hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, FALSE, + D3DMULTISAMPLE_NONE, &qualityLevels); + ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); + todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + +cleanup: + if (pD3d) IUnknown_Release( pD3d ); + if (pDevice) IUnknown_Release( pDevice ); + DestroyWindow( hwnd ); +} + static void test_swapchain(void) { HRESULT hr; @@ -2230,6 +2280,7 @@ START_TEST(device) test_swapchain(); test_refcount(); test_mipmap_levels(); + test_checkdevicemultisampletype(); test_cursor(); test_reset(); test_scene();

1 0

Piotr Caban : jscript: Fix integer/double parsing.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 063df731ac7b1795786ec447b5b325a043fc44d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063df731ac7b1795786ec447b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:10:49 2009 +0200 jscript: Fix integer/double parsing. --- dlls/jscript/lex.c | 26 ++++++++++++++++++++------ dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 68bfef8..c066397 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -17,6 +17,7 @@ */ #include <math.h> +#include <limits.h> #include "jscript.h" #include "activscp.h" @@ -374,13 +375,19 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li { double d, tmp = 1.0; - if(ctx->ptr == ctx->end || !isdigitW(*ctx->ptr)) { - ERR("No digit after point\n"); + if(ctx->ptr == ctx->end || (!isdigitW(*ctx->ptr) && + *ctx->ptr!='.' && *ctx->ptr!='e' && *ctx->ptr!='E')) { + ERR("Illegal character\n"); return 0; } d = int_part; while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) + d = d*10 + *(ctx->ptr++) - '0'; + + if(*ctx->ptr == '.') ctx->ptr++; + + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) d += (tmp /= 10.0)*(*ctx->ptr++ - '0'); if(ctx->ptr < ctx->end && (*ctx->ptr == 'e' || *ctx->ptr == 'E')) { @@ -458,13 +465,20 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) } while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - l = l*10 + *(ctx->ptr++)-'0'; + { + d = l*10 + *(ctx->ptr)-'0'; + + /* Check for integer overflow */ + if (l > INT_MAX/10 || d < 0) + return parse_double_literal(ctx, l, literal); + + l = d; + ctx->ptr++; + } if(ctx->ptr < ctx->end) { - if(*ctx->ptr == '.') { - ctx->ptr++; + if(*ctx->ptr == '.' || *ctx->ptr == 'e' || *ctx->ptr == 'E') return parse_double_literal(ctx, l, literal); - } if(is_identifier_char(*ctx->ptr)) { WARN("unexpected identifier char\n"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 0d68f37..c4f0194 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -33,6 +33,8 @@ ok(true === true, "true === true is false"); ok(null === null, "null === null is false"); ok(undefined === undefined, "undefined === undefined is false"); ok(!(undefined === null), "!(undefined === null) is false"); +ok(1E0 === 1, "1E0 === 1 is false"); +ok(1000000*1000000 === 1000000000000, "1000000*1000000 === 1000000000000 is false"); ok(1 !== 2, "1 !== 2 is false"); ok(null !== undefined, "null !== undefined is false");

1 0

Piotr Caban : jscript: Added Math_tan implementation.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: f2c1095a8054b7a8fb1f34cb11cc8fff97e3cef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c1095a8054b7a8fb1f34cb1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:10:36 2009 +0200 jscript: Added Math_tan implementation. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 27 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 2928a97..1969ff7 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -543,8 +543,22 @@ static HRESULT Math_sqrt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_tan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, tan(num_val(&v))); + return S_OK; } static const builtin_prop_t Math_props[] = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 54fc2a1..c1da8c8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -878,6 +878,33 @@ ok(tmp === Infinity, "Math.sqrt(Infinity) = " + tmp); tmp = Math.sqrt(-Infinity); ok(isNaN(tmp), "Math.sqrt(-Infinity) is not NaN"); +tmp = Math.tan(0); +ok(tmp === 0, "Math.tan(0) = " + tmp); + +tmp = Math.tan(Math.PI); +ok(Math.floor(tmp*100) === -1, "Math.tan(Math.PI) = " + tmp); + +tmp = Math.tan(2, 2); +ok(Math.floor(tmp*100) === -219, "Math.tan(2, 2) = " + tmp); + +tmp = Math.tan(true); +ok(Math.floor(tmp*100) === 155, "Math.tan(true) = " + tmp); + +tmp = Math.tan(false); +ok(tmp === 0, "Math.tan(false) = " + tmp); + +tmp = Math.tan(); +ok(isNaN(tmp), "Math.tan() is not NaN"); + +tmp = Math.tan(NaN); +ok(isNaN(tmp), "Math.tan(NaN) is not NaN"); + +tmp = Math.tan(Infinity); +ok(isNaN(tmp), "Math.tan(Infinity) is not NaN"); + +tmp = Math.tan(-Infinity); +ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added implementation of Math_sqrt.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 8c609c9f50bf7f961bdfe07a8e8a0b57bdcd703d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c609c9f50bf7f961bdfe07a8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:10:25 2009 +0200 jscript: Added implementation of Math_sqrt. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 9804c36..2928a97 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -522,8 +522,22 @@ static HRESULT Math_sin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_sqrt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, sqrt(num_val(&v))); + return S_OK; } static HRESULT Math_tan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a5d9286..54fc2a1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -848,6 +848,36 @@ ok(isNaN(tmp), "Math.sin(Infinity) is not NaN"); tmp = Math.sin(-Infinity); ok(isNaN(tmp), "Math.sin(-Infinity) is not NaN"); +tmp = Math.sqrt(0); +ok(tmp === 0, "Math.sqrt(0) = " + tmp); + +tmp = Math.sqrt(4); +ok(tmp === 2, "Math.sqrt(4) = " + tmp); + +tmp = Math.sqrt(-1); +ok(isNaN(tmp), "Math.sqrt(-1) is not NaN"); + +tmp = Math.sqrt(2, 2); +ok(Math.floor(tmp*100) === 141, "Math.sqrt(2, 2) = " + tmp); + +tmp = Math.sqrt(true); +ok(tmp === 1, "Math.sqrt(true) = " + tmp); + +tmp = Math.sqrt(false); +ok(tmp === 0, "Math.sqrt(false) = " + tmp); + +tmp = Math.sqrt(); +ok(isNaN(tmp), "Math.sqrt() is not NaN"); + +tmp = Math.sqrt(NaN); +ok(isNaN(tmp), "Math.sqrt(NaN) is not NaN"); + +tmp = Math.sqrt(Infinity); +ok(tmp === Infinity, "Math.sqrt(Infinity) = " + tmp); + +tmp = Math.sqrt(-Infinity); +ok(isNaN(tmp), "Math.sqrt(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added Math_sin implementation.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: a67672f9eef88160007f28fcd4d1ff1b1483f6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67672f9eef88160007f28fcd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:10:10 2009 +0200 jscript: Added Math_sin implementation. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 9b41385..9804c36 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -501,8 +501,22 @@ static HRESULT Math_round(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Math_sin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, sin(num_val(&v))); + return S_OK; } static HRESULT Math_sqrt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d810ff0..a5d9286 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -818,6 +818,36 @@ ok(tmp === Infinity, "Math.log(Infinity) = " + tmp); tmp = Math.log(-Infinity); ok(isNaN(tmp), "Math.log(-Infinity) is not NaN"); +tmp = Math.sin(0); +ok(tmp === 0, "Math.sin(0) = " + tmp); + +tmp = Math.sin(Math.PI/2); +ok(tmp === 1, "Math.sin(Math.PI/2) = " + tmp); + +tmp = Math.sin(-Math.PI/2); +ok(tmp === -1, "Math.sin(-Math.PI/2) = " + tmp); + +tmp = Math.sin(Math.PI/3, 2); +ok(Math.floor(tmp*100) === 86, "Math.sin(Math.PI/3, 2) = " + tmp); + +tmp = Math.sin(true); +ok(Math.floor(tmp*100) === 84, "Math.sin(true) = " + tmp); + +tmp = Math.sin(false); +ok(tmp === 0, "Math.sin(false) = " + tmp); + +tmp = Math.sin(); +ok(isNaN(tmp), "Math.sin() is not NaN"); + +tmp = Math.sin(NaN); +ok(isNaN(tmp), "Math.sin(NaN) is not NaN"); + +tmp = Math.sin(Infinity); +ok(isNaN(tmp), "Math.sin(Infinity) is not NaN"); + +tmp = Math.sin(-Infinity); +ok(isNaN(tmp), "Math.sin(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added implementation of Math_log.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: f57f3aa2f430d2e4e0f984a6be619c797be71423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57f3aa2f430d2e4e0f984a6b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 01:09:56 2009 +0200 jscript: Added implementation of Math_log. --- dlls/jscript/math.c | 20 ++++++++++++++++++-- dlls/jscript/tests/api.js | 24 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 0253111..9b41385 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -337,8 +337,24 @@ static HRESULT Math_floor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Math_log(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) + num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) + num_set_val(retv, log(num_val(&v))); + return S_OK; } /* ECMA-262 3rd Edition 15.8.2.11 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 8c2065e..d810ff0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -794,6 +794,30 @@ ok(tmp === Infinity, "Math.exp(Infinity) = " + tmp); tmp = Math.exp(-Infinity); ok(tmp === 0, "Math.exp(-Infinity) = " + tmp); +tmp = Math.log(1); +ok(Math.floor(tmp*100) === 0, "Math.log(1) = " + tmp); + +tmp = Math.log(-1); +ok(isNaN(tmp), "Math.log(-1) is not NaN"); + +tmp = Math.log(true); +ok(Math.floor(tmp*100) === 0, "Math.log(true) = " + tmp); + +tmp = Math.log(1, 1); +ok(Math.floor(tmp*100) === 0, "Math.log(1, 1) = " + tmp); + +tmp = Math.log(); +ok(isNaN(tmp), "Math.log() is not NaN"); + +tmp = Math.log(NaN); +ok(isNaN(tmp), "Math.log(NaN) is not NaN"); + +tmp = Math.log(Infinity); +ok(tmp === Infinity, "Math.log(Infinity) = " + tmp); + +tmp = Math.log(-Infinity); +ok(isNaN(tmp), "Math.log(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009