November 2007 - Wine-commits

Stefan Dösinger : wined3d: mov to a0.x does a floor(), not a round to nearest.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 6209b36acbef6e7f8edcf3a45a006bb09bffe4af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6209b36acbef6e7f8edcf3a45… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 7 19:41:56 2007 +0100 wined3d: mov to a0.x does a floor(), not a round to nearest. --- dlls/d3d9/tests/visual.c | 101 +++++++++++++++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 14 +++++- 2 files changed, 79 insertions(+), 36 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0673e99..6362b5c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -323,13 +323,13 @@ typedef struct { } test_data_t; /* - * c7 rounded ARGB - * -2.4 -2 0x00ffff00 - * -1.6 -2 0x00ffff00 - * -0.4 0 0x0000ffff - * 0.4 0 0x0000ffff - * 1.6 2 0x00ff00ff - * 2.4 2 0x00ff00ff + * c7 mova ARGB mov ARGB + * -2.4 -2 0x00ffff00 -3 0x00ff0000 + * -1.6 -2 0x00ffff00 -2 0x00ffff00 + * -0.4 0 0x0000ffff -1 0x0000ff00 + * 0.4 0 0x0000ffff 0 0x0000ffff + * 1.6 2 0x00ff00ff 1 0x000000ff + * 2.4 2 0x00ff00ff 2 0x00ff00ff */ static void test_mova(IDirect3DDevice9 *device) { @@ -348,14 +348,39 @@ static void test_mova(IDirect3DDevice9 *device) 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ 0x0000ffff /* END */ }; + static const DWORD mov_test[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ + 0x00000051, 0xa00f0001, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, /* def c1, 1.0, 1.0, 0.0, 1.0 */ + 0x00000051, 0xa00f0002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, /* def c2, 0.0, 1.0, 0.0, 1.0 */ + 0x00000051, 0xa00f0003, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c3, 0.0, 1.0, 1.0, 1.0 */ + 0x00000051, 0xa00f0004, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, /* def c4, 0.0, 0.0, 1.0, 1.0 */ + 0x00000051, 0xa00f0005, 0x3f800000, 0x00000000, 0x3f800000, 0x3f800000, /* def c5, 1.0, 0.0, 1.0, 1.0 */ + 0x00000051, 0xa00f0006, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c6, 1.0, 1.0, 1.0, 1.0 */ + 0x00000001, 0xb0010000, 0xa0000007, /* mov a0.x, c7.x */ + 0x00000001, 0xd00f0000, 0xa0e42003, /* mov oD0, c[a0.x + 3] */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x0000ffff /* END */ + }; - static const test_data_t test_data[] = { - {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, - {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} + static const test_data_t test_data[2][6] = { + { + {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff0000}, + {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ff00}, + {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x000000ff}, + {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} + }, + { + {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, + {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} + } }; static const float quad[][3] = { @@ -372,43 +397,51 @@ static void test_mova(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9 *vertex_declaration = NULL; IDirect3DVertexShader9 *mova_shader = NULL; + IDirect3DVertexShader9 *mov_shader = NULL; HRESULT hr; - int i; + int i, j; hr = IDirect3DDevice9_CreateVertexShader(device, mova_test, &mova_shader); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - + hr = IDirect3DDevice9_CreateVertexShader(device, mov_test, &mov_shader); + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr); - for (i = 0; i < (sizeof(test_data) / sizeof(test_data_t)); ++i) + hr = IDirect3DDevice9_SetVertexShader(device, mov_shader); + ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); + for(j = 0; j < 2; ++j) { - DWORD color; + for (i = 0; i < (sizeof(test_data[0]) / sizeof(test_data_t)); ++i) + { + DWORD color; - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[i].in, 1); - ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[j][i].in, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); - ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == test_data[i].out, "Expected color %08x, got %08x (for input %f)\n", test_data[i].out, color, test_data[i].in[0]); + color = getPixelColor(device, 320, 240); + ok(color == test_data[j][i].out, "Expected color %08x, got %08x (for input %f, instruction %s)\n", + test_data[j][i].out, color, test_data[j][i].in[0], j == 0 ? "mov" : "mova"); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); - ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); + } + hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); + ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); } hr = IDirect3DDevice9_SetVertexShader(device, NULL); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c2da059..9567a47 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1299,8 +1299,18 @@ void shader_glsl_mov(SHADER_OPCODE_ARG* arg) { * shader versions WINED3DSIO_MOVA is used for this. */ if ((WINED3DSHADER_VERSION_MAJOR(shader->baseShader.hex_version) == 1 && !shader_is_pshader_version(shader->baseShader.hex_version) && - shader_get_regtype(arg->dst) == WINED3DSPR_ADDR) || - arg->opcode->opcode == WINED3DSIO_MOVA) { + shader_get_regtype(arg->dst) == WINED3DSPR_ADDR)) { + /* This is a simple floor(). Msdn claims it is a round to nearest, but our test shows + * that it is just a floor(). ATI docs confirm that, and the test succeeds on the + * reference rasterizer too + */ + size_t mask_size = shader_glsl_get_write_mask_size(write_mask); + if (mask_size > 1) { + shader_addline(buffer, "ivec%d(floor(%s)));\n", mask_size, src0_param.param_str); + } else { + shader_addline(buffer, "int(floor(%s)));\n", src0_param.param_str); + } + } else if(arg->opcode->opcode == WINED3DSIO_MOVA) { /* We need to *round* to the nearest int here. */ size_t mask_size = shader_glsl_get_write_mask_size(write_mask); if (mask_size > 1) {

1 0

Stefan Dösinger : wined3d: Replace the position fixup mul-add-add with a MAD.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: c7c785861af93448a22e3d6d6cab03a86ab7b5fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c785861af93448a22e3d6d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 2 01:11:15 2007 +0100 wined3d: Replace the position fixup mul-add-add with a MAD. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/vertexshader.c | 30 ++++++++++++------------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ada76e2..9ccc47b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2642,6 +2642,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, } else { object->surface_alignment = 4; } + object->posFixup[0] = 1.0; /* This is needed to get the x coord unmodified through a MAD */ /* Set the state up as invalid until the device is fully created */ object->state = WINED3DERR_DRIVERINTERNALERROR; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e49e34a..4e2a7c5 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -333,20 +333,16 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( /* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */ if (!reg_maps->fog) shader_addline(&buffer, "gl_FogFragCoord = gl_Position.z;\n"); - + /* Write the final position. * * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. The offsets are stored in z and w in the 2nd row of the projection - * matrix to avoid wasting a free shader constant. Add them to the w and z coord - * of the 2nd row - */ - shader_addline(&buffer, "gl_Position.x = gl_Position.x + posFixup[2];\n"); - shader_addline(&buffer, "gl_Position.y = gl_Position.y + posFixup[3];\n"); - /* Account for any inverted textures (render to texture case) by reversing the y coordinate - * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) + * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains + * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x + * contains 1.0 to allow a mad. */ - shader_addline(&buffer, "gl_Position.y = gl_Position.y * posFixup[1];\n"); + shader_addline(&buffer, "gl_Position.xy = gl_Position.xy * posFixup.xy + posFixup.zw;\n"); + /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * * Basically we want(in homogenous coordinates) z = z * 2 - 1. However, shaders are run @@ -399,15 +395,13 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( /* Write the final position. * * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. The offsets are stored in the 2nd row of the projection matrix, - * the x offset in z and the y offset in w. Add them to the resulting position - */ - shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, posFixup.z;\n"); - shader_addline(&buffer, "ADD TMP_OUT.y, TMP_OUT.y, posFixup.w;\n"); - /* Account for any inverted textures (render to texture case) by reversing the y coordinate - * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) + * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains + * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x + * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. */ - shader_addline(&buffer, "MUL TMP_OUT.y, TMP_OUT.y, posFixup.y;\n"); + shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, posFixup.z;"); + shader_addline(&buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, posFixup.w;"); + /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */

1 0

Stefan Dösinger : wined3d: Avoid NOP additions.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 0183f3e305ae1e40a806682ec85e8b4507e4ddd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0183f3e305ae1e40a806682ec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 2 01:50:20 2007 +0100 wined3d: Avoid NOP additions. --- dlls/wined3d/glsl_shader.c | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9567a47..46f87aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -802,8 +802,15 @@ static void shader_glsl_get_register_name( glsl_src_param_t rel_param; shader_glsl_add_src_param(arg, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); - sprintf(tmpStr, "IN[%s + %u]", rel_param.param_str, - ((IWineD3DPixelShaderImpl *) This)->input_reg_map[reg]); + /* Removing a + 0 would be an obvious optimization, but macos doesn't see the NOP + * operation there + */ + if(((IWineD3DPixelShaderImpl *) This)->input_reg_map[reg]) { + sprintf(tmpStr, "IN[%s + %u]", rel_param.param_str, + ((IWineD3DPixelShaderImpl *) This)->input_reg_map[reg]); + } else { + sprintf(tmpStr, "IN[%s]", rel_param.param_str); + } } else { sprintf(tmpStr, "IN[%u]", ((IWineD3DPixelShaderImpl *) This)->input_reg_map[reg]); @@ -832,9 +839,18 @@ static void shader_glsl_get_register_name( if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2) { glsl_src_param_t rel_param; shader_glsl_add_src_param(arg, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); - sprintf(tmpStr, "%s[%s + %u]", prefix, rel_param.param_str, reg); - } else - sprintf(tmpStr, "%s[A0.x + %u]", prefix, reg); + if(reg) { + sprintf(tmpStr, "%s[%s + %u]", prefix, rel_param.param_str, reg); + } else { + sprintf(tmpStr, "%s[%s]", prefix, rel_param.param_str); + } + } else { + if(reg) { + sprintf(tmpStr, "%s[A0.x + %u]", prefix, reg); + } else { + sprintf(tmpStr, "%s[A0.x]", prefix); + } + } } else sprintf(tmpStr, "%s[%u]", prefix, reg); @@ -1299,18 +1315,8 @@ void shader_glsl_mov(SHADER_OPCODE_ARG* arg) { * shader versions WINED3DSIO_MOVA is used for this. */ if ((WINED3DSHADER_VERSION_MAJOR(shader->baseShader.hex_version) == 1 && !shader_is_pshader_version(shader->baseShader.hex_version) && - shader_get_regtype(arg->dst) == WINED3DSPR_ADDR)) { - /* This is a simple floor(). Msdn claims it is a round to nearest, but our test shows - * that it is just a floor(). ATI docs confirm that, and the test succeeds on the - * reference rasterizer too - */ - size_t mask_size = shader_glsl_get_write_mask_size(write_mask); - if (mask_size > 1) { - shader_addline(buffer, "ivec%d(floor(%s)));\n", mask_size, src0_param.param_str); - } else { - shader_addline(buffer, "int(floor(%s)));\n", src0_param.param_str); - } - } else if(arg->opcode->opcode == WINED3DSIO_MOVA) { + shader_get_regtype(arg->dst) == WINED3DSPR_ADDR) || + arg->opcode->opcode == WINED3DSIO_MOVA) { /* We need to *round* to the nearest int here. */ size_t mask_size = shader_glsl_get_write_mask_size(write_mask); if (mask_size > 1) {

1 0

Stefan Dösinger : wined3d: Honor the driver' s min point size.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 5ffea6e5916ffd6d8aeade5fa28c6db8e069e7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffea6e5916ffd6d8aeade5fa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 3 15:39:22 2007 +0100 wined3d: Honor the driver's min point size. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/state.c | 14 +++++++++----- include/wine/wined3d_gl.h | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ccc47b..cff6550 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -641,6 +641,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Maximum texture size support - max texture size=%d\n", gl_max); glGetFloatv(GL_POINT_SIZE_RANGE, gl_floatv); + gl_info->max_pointsizemin = gl_floatv[0]; gl_info->max_pointsize = gl_floatv[1]; TRACE_(d3d_caps)("Maximum point size support - max point size=%f\n", gl_floatv[1]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7e847c9..251e77f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1312,14 +1312,18 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 GLfloat scaleFactor; float h = stateblock->viewport.Height; - if(pointSize.f < 1.0f) { + if(pointSize.f < GL_LIMITS(pointsizemin)) { /* - * Minimum valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. - * This means that OpenGL will clamp really small point sizes to 1.0f. - * To correct for this we need to multiply by the scale factor when sizes + * Minimum valid point size for OpenGL is driver specific. For Direct3D it is + * 0.0f. This means that OpenGL will clamp really small point sizes to the + * driver minimum. To correct for this we need to multiply by the scale factor when sizes * are less than 1.0f. scale_factor = 1.0f / point_size. */ - scaleFactor = pointSize.f; + scaleFactor = pointSize.f / GL_LIMITS(pointsizemin); + /* Clamp the point size, don't rely on the driver to do it. MacOS says min point size + * is 1.0, but then accepts points below that and draws too small points + */ + pointSize.f = GL_LIMITS(pointsizemin); } else if(pointSize.f > GL_LIMITS(pointsize)) { /* gl already scales the input to glPointSize, * d3d scales the result after the point size scale. diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 7fbe25c..1c316e9 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1137,6 +1137,7 @@ void (WINE_GLAPI *glVertex4s) (GLshort x, GLshort y, GLshort z, GLshort w); void (WINE_GLAPI *glVertex4sv) (const GLshort* v); void (WINE_GLAPI *glVertexPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid* pointer); void (WINE_GLAPI *glViewport) (GLint x, GLint y, GLsizei width, GLsizei height); +void (WINE_GLAPI *glPointParameterfv) (GLenum pname, const GLfloat *params); /* WGL functions */ HGLRC (WINAPI *pwglCreateContext)(HDC); @@ -1483,7 +1484,8 @@ BOOL (WINAPI *pwglShareLists)(HGLRC,HGLRC); USE_GL_FUNC(glVertex4s) \ USE_GL_FUNC(glVertex4sv) \ USE_GL_FUNC(glVertexPointer) \ - USE_GL_FUNC(glViewport) + USE_GL_FUNC(glViewport) \ + USE_GL_FUNC(glPointParameterfv) \ #define WGL_FUNCS_GEN \ USE_WGL_FUNC(wglCreateContext) \ @@ -3719,7 +3721,7 @@ typedef struct _WineD3D_GL_Info { UINT max_clipplanes; UINT max_texture_size; UINT max_texture3d_size; - float max_pointsize; + float max_pointsize, max_pointsizemin; UINT max_blends; UINT max_anisotropy; UINT max_aux_buffers;

1 0

Stefan Dösinger : wined3d: Take care for client storage and pbos.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: ed937c6ad4966f57e2e19892c5decd73e180159d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed937c6ad4966f57e2e19892c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 3 16:24:55 2007 +0100 wined3d: Take care for client storage and pbos. --- dlls/wined3d/surface.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4aa386f..7b25d18 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -200,11 +200,6 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { FIXME("Using DXT1/3/5 without advertized support\n"); } else { - if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { - /* Neither NONPOW2, DIBSECTION nor OVERSIZE flags can be set on compressed textures */ - This->Flags |= SFLAG_CLIENT; - } - /* glCompressedTexSubImage2D for uploading and glTexImage2D for allocating does not work well on some drivers(r200 dri, MacOS ATI driver) * glCompressedTexImage2D does not accept NULL pointers. So for compressed textures surface_allocate_surface does nothing, and this * function uses glCompressedTexImage2D instead of the SubImage call @@ -256,6 +251,7 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, GLsizei width, GLsizei height, GLenum format, GLenum type) { BOOL enable_client_storage = FALSE; + BYTE *mem = NULL; TRACE("(%p) : Creating surface (target %#x) level %d, d3d format %s, internal format %#x, width %d, height %d, gl format %#x, gl type=%#x\n", This, This->glDescription.target, This->glDescription.level, debug_d3dformat(This->resource.format), internal, width, height, format, type); @@ -265,6 +261,18 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { /* glCompressedTexImage2D does not accept NULL pointers, so we cannot allocate a compressed texture without uploading data */ TRACE("Not allocating compressed surfaces, surface_upload_data will specify them\n"); + + /* We have to point GL to the client storage memory here, because upload_data might use a PBO. This means a double upload + * once, unfortunately + */ + if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { + /* Neither NONPOW2, DIBSECTION nor OVERSIZE flags can be set on compressed textures */ + This->Flags |= SFLAG_CLIENT; + mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, + width, height, 0 /* border */, This->resource.size, mem)); + } + return; } @@ -285,11 +293,14 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, enable_client_storage = TRUE; } else { This->Flags |= SFLAG_CLIENT; - /* Below point opengl to our allocated texture memory */ + + /* Point opengl to our allocated texture memory. Do not use resource.allocatedMemory here because + * it might point into a pbo. Instead use heapMemory, but get the alignment right. + */ + mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); } } - glTexImage2D(This->glDescription.target, This->glDescription.level, internal, width, height, 0, format, type, - This->Flags & SFLAG_CLIENT ? This->resource.allocatedMemory : NULL); + glTexImage2D(This->glDescription.target, This->glDescription.level, internal, width, height, 0, format, type, mem); checkGLcall("glTexImage2D"); if(enable_client_storage) { @@ -751,16 +762,20 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { checkGLcall("glBindBufferARB"); /* We don't need the system memory anymore and we can't even use it for PBOs */ - HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); + if(!(This->Flags & SFLAG_CLIENT)) { + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); + This->resource.heapMemory = NULL; + } This->resource.allocatedMemory = NULL; - This->resource.heapMemory = NULL; This->Flags |= SFLAG_PBO; LEAVE_GL(); } else if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, * or a pbo to map */ - This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + RESOURCE_ALIGNMENT); + if(!This->resource.heapMemory) { + This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + RESOURCE_ALIGNMENT); + } This->resource.allocatedMemory = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); if(This->Flags & SFLAG_INSYSMEM) {

1 0

Stefan Dösinger : wined3d: Get rid of the conditionals in shader_glsl_compare.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 98b291192f2b2579502f17d4c161fe1a18aa4966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b291192f2b2579502f17d4c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 5 23:13:00 2007 +0100 wined3d: Get rid of the conditionals in shader_glsl_compare. --- dlls/wined3d/glsl_shader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 46f87aa..0dfcccd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1563,17 +1563,17 @@ void shader_glsl_compare(SHADER_OPCODE_ARG* arg) { shader_addline(arg->buffer, "vec%d(%s(%s, %s)));\n", mask_size, compare, src0_param.param_str, src1_param.param_str); } else { - const char *compare; - switch(arg->opcode->opcode) { - case WINED3DSIO_SLT: compare = "<"; break; - case WINED3DSIO_SGE: compare = ">="; break; - default: compare = ""; + case WINED3DSIO_SLT: + shader_addline(arg->buffer, "step(%s, %s));\n", src0_param.param_str, src1_param.param_str); + break; + case WINED3DSIO_SGE: + shader_addline(arg->buffer, "step(%s, %s));\n", src1_param.param_str, src0_param.param_str); + break; + default: FIXME("Can't handle opcode %s\n", arg->opcode->name); } - shader_addline(arg->buffer, "(%s %s %s) ? 1.0 : 0.0);\n", - src0_param.param_str, compare, src1_param.param_str); } }

1 0

Stefan Dösinger : wined3d: Fix the varying number comparison.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 36330f05428951d752468de6a3eebdfc939231e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36330f05428951d752468de6a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 7 18:22:00 2007 +0100 wined3d: Fix the varying number comparison. --- dlls/wined3d/pixelshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 138e419..483c0ad 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -563,8 +563,8 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i * achive anything anyway */ if(highest_reg_used < (GL_LIMITS(glsl_varyings) / 4) || - num_regs_used >= (GL_LIMITS(glsl_varyings) / 4) ) { - if(num_regs_used >= (GL_LIMITS(glsl_varyings) / 4)) { + num_regs_used > (GL_LIMITS(glsl_varyings) / 4) ) { + if(num_regs_used > (GL_LIMITS(glsl_varyings) / 4)) { /* This happens with relative addressing. The input mapper function * warns about this if the higher registers are declared too, so * don't write a FIXME here

1 0

Juan Lang : cfgmgr32: Forward cfgmgr32 functions to setupapi.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: f9f18bfb06e9e1b706eda7afeb1b1c892cc354f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f18bfb06e9e1b706eda7afe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 10:38:49 2007 -0800 cfgmgr32: Forward cfgmgr32 functions to setupapi. --- dlls/cfgmgr32/Makefile.in | 3 -- dlls/cfgmgr32/cfgmgr32.spec | 6 ++-- dlls/cfgmgr32/main.c | 79 ------------------------------------------- 3 files changed, 3 insertions(+), 85 deletions(-) diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in index 33360db..9974fbc 100644 --- a/dlls/cfgmgr32/Makefile.in +++ b/dlls/cfgmgr32/Makefile.in @@ -6,9 +6,6 @@ MODULE = cfgmgr32.dll IMPORTLIB = libcfgmgr32.$(IMPLIBEXT) IMPORTS = setupapi kernel32 -C_SRCS = \ - main.c - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 2d53dd1..b00648b 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -60,11 +60,11 @@ @ stub CM_Get_DevNode_Registry_Property_ExW @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex -@ stdcall CM_Get_Device_IDA(ptr ptr long long) +@ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stub CM_Get_Device_IDW @ stub CM_Get_Device_ID_ExA @ stub CM_Get_Device_ID_ExW -@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) +@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) setupapi.CM_Get_Device_ID_ListA @ stub CM_Get_Device_ID_ListW @ stub CM_Get_Device_ID_List_ExA @ stub CM_Get_Device_ID_List_ExW @@ -72,7 +72,7 @@ @ stub CM_Get_Device_ID_List_SizeW @ stub CM_Get_Device_ID_List_Size_ExA @ stub CM_Get_Device_ID_List_Size_ExW -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size @ stub CM_Get_Device_ID_Size_Ex @ stub CM_Get_Device_Interface_AliasA @ stub CM_Get_Device_Interface_AliasW diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c deleted file mode 100644 index 9f27a29..0000000 --- a/dlls/cfgmgr32/main.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * cfgmgr32 implementation - * - * Copyright 2004 Aric Stewart for CodeWeavers - * Copyright 2003 Mike McCormack for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "cfgmgr32.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(cfgmgr32); - -/*********************************************************************** - * DllMain (CFGMGR32.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - -/*********************************************************************** - * CM_Get_Device_ID_ListA (CFGMGR32.@) - */ -CONFIGRET WINAPI CM_Get_Device_ID_ListA( - PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) -{ - FIXME("%p %p %d %d\n", pszFilter, Buffer, BufferLen, ulFlags ); - memset(Buffer,0,2); - return CR_SUCCESS; -} - -/*********************************************************************** - * CM_Get_Device_ID_Size (CFGMGR32.@) - */ -CONFIGRET WINAPI CM_Get_Device_ID_Size( ULONG* pulLen, LPVOID dnDevInst, - ULONG ulFlags) -{ - FIXME("%p %p %u\n",pulLen, dnDevInst, ulFlags); - *pulLen = 1; - return CR_SUCCESS; -} - -/*********************************************************************** - * CM_Get_Device_IDA (CFGMGR32.@) - */ -CONFIGRET WINAPI CM_Get_Device_IDA( LPVOID dnDevInst, LPSTR Buffer, - ULONG BufferLen, ULONG ulFlags) -{ - FIXME("%p, %p, %u %u\n",dnDevInst, Buffer, BufferLen, ulFlags); - Buffer[0] = 0; - return CR_SUCCESS; -}

1 0

Juan Lang : crypt32: Fix a leak.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 571d75187a0e1c6b008a7e0186a1cf99e2dc2f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=571d75187a0e1c6b008a7e018… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 09:24:55 2007 -0800 crypt32: Fix a leak. --- dlls/crypt32/tests/protectdata.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 8ea0158..64ffa68 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -195,6 +195,7 @@ static void test_cryptunprotectdata(void) ok(data_desc!=NULL,"Description not allocated\n"); ok(data_desc[0]=='\0',"Description not empty\n"); + LocalFree(data_desc); LocalFree(plain.pbData); plain.pbData=NULL;

1 0

Juan Lang : crypt32: Use 3DES to encrypt data.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 72ab894db12cdc714c151cb51a707d1fc6fc2cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ab894db12cdc714c151cb51… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 09:16:48 2007 -0800 crypt32: Use 3DES to encrypt data. --- dlls/crypt32/protectdata.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index ea27978..d5ec287 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -49,8 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); #define CRYPT32_PROTECTDATA_PROV PROV_RSA_FULL #define CRYPT32_PROTECTDATA_HASH_CALG CALG_SHA1 #define CRYPT32_PROTECTDATA_HASH_LEN 160 -#define CRYPT32_PROTECTDATA_KEY_CALG CALG_RC2 -#define CRYPT32_PROTECTDATA_KEY_LEN 40 +#define CRYPT32_PROTECTDATA_KEY_CALG CALG_3DES +#define CRYPT32_PROTECTDATA_KEY_LEN 168 #define CRYPT32_PROTECTDATA_SALT_LEN 16 static const BYTE crypt32_protectdata_secret[] = {

1 0