wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Alexandre Julliard : winebuild: Properly restore %rax and %rbx in call_from_regs on x86_64.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: e00b4582a14529f29bdfbf3116c3e065b6db7303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00b4582a14529f29bdfbf311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 13:22:04 2009 +0200 winebuild: Properly restore %rax and %rbx in call_from_regs on x86_64. --- tools/winebuild/relay.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index ddc8051..f049c9e 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -1121,6 +1121,8 @@ static void build_call_from_regs_x86_64(void) output( "\tmovq %%rax,0x18(%%rsp)\n" ); output( "\tmovw 0x42(%%rbx),%%ax\n" ); /* ss */ output( "\tmovq %%rax,0x20(%%rsp)\n" ); + output( "\tmovq 0x78(%%rbx),%%rax\n" ); + output( "\tmovq 0x90(%%rbx),%%rbx\n" ); output( "\tiretq\n" ); output_function_size( "__wine_call_from_regs" );

1 0

Alexandre Julliard : kernel32: Forward RtlUnwindEx to ntdll for x86_64.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 31b96c6f3b34f8607bd47983d1440c0e31715701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b96c6f3b34f8607bd47983d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 13:21:10 2009 +0200 kernel32: Forward RtlUnwindEx to ntdll for x86_64. --- dlls/kernel32/kernel32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b555621..1734460 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -928,6 +928,7 @@ @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall -i386 -norelay SMapLS()

1 0

Ken Sharp : gdiplus: Add stubs for GdipGetVisibleClipBoundsI, GdipDrawDriverString & GdipMeasureDriverString.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: e3f4859961fcc8e386a15ea92f9c892d4b3b1245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f4859961fcc8e386a15ea92… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Tue Jun 9 21:48:05 2009 +0100 gdiplus: Add stubs for GdipGetVisibleClipBoundsI, GdipDrawDriverString & GdipMeasureDriverString. --- dlls/gdiplus/gdiplus.spec | 6 +++--- dlls/gdiplus/graphics.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 72fdcb6..03c9629 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -169,7 +169,7 @@ @ stub GdipDrawCurve3I @ stdcall GdipDrawCurve(ptr ptr ptr long) @ stdcall GdipDrawCurveI(ptr ptr ptr long) -@ stub GdipDrawDriverString +@ stdcall GdipDrawDriverString(ptr ptr long ptr ptr ptr long ptr) @ stdcall GdipDrawEllipse(ptr ptr long long long long) @ stdcall GdipDrawEllipseI(ptr ptr long long long long) @ stdcall GdipDrawImage(ptr ptr long long) @@ -401,7 +401,7 @@ @ stdcall GdipGetTextureTransform(ptr ptr) @ stdcall GdipGetTextureWrapMode(ptr ptr) @ stub GdipGetVisibleClipBounds -@ stub GdipGetVisibleClipBoundsI +@ stdcall GdipGetVisibleClipBoundsI(ptr ptr) @ stdcall GdipGetWorldTransform(ptr ptr) @ stdcall GdipGraphicsClear(ptr long) @ stub GdipGraphicsSetAbort @@ -440,7 +440,7 @@ @ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stdcall GdipMeasureCharacterRanges(ptr wstr long ptr ptr ptr long ptr) -@ stub GdipMeasureDriverString +@ stdcall GdipMeasureDriverString(ptr ptr long ptr ptr long ptr ptr) @ stdcall GdipMeasureString(ptr wstr long ptr ptr ptr ptr ptr ptr) @ stub GdipMultiplyLineTransform @ stdcall GdipMultiplyMatrix(ptr ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c7fa0be..85ecf43 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -955,7 +955,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra TRACE("(%p, %p, %p)\n", hdc, hDevice, graphics); if(hDevice != NULL) { - FIXME("Don't know how to hadle parameter hDevice\n"); + FIXME("Don't know how to handle parameter hDevice\n"); return NotImplemented; } @@ -3845,3 +3845,36 @@ GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics *graphics, INT dx, INT dy) return GdipTranslateRegion(graphics->clip, (REAL)dx, (REAL)dy); } + + +/***************************************************************************** + * GdipMeasureDriverString [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST PointF *positions, + INT flags, GDIPCONST GpMatrix *matrix, RectF *boundingBox) +{ + FIXME("(%p %p %d %p %p %d %p %p): stub\n", graphics, text, length, font, positions, flags, matrix, boundingBox); + return NotImplemented; +} + +/***************************************************************************** + * GdipGetVisibleClipBoundsI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics *graphics, GpRect *rect) +{ + FIXME("(%p %p): stub\n", graphics, rect); + return NotImplemented; +} + +/***************************************************************************** + * GdipDrawDriverString [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST GpBrush *brush, + GDIPCONST PointF *positions, INT flags, + GDIPCONST GpMatrix *matrix ) +{ + FIXME("(%p %p %d %p %p %p %d %p): stub \n", graphics, text, length, font, brush, positions, flags, matrix); + return NotImplemented; +}

1 0

Paul Vriens : riched32/tests: Fix a few test failures on Win9x, WinME and NT4.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 984300b59e70047c0964b9c269ffedb236ea3206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=984300b59e70047c0964b9c26… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 10 10:16:13 2009 +0200 riched32/tests: Fix a few test failures on Win9x, WinME and NT4. --- dlls/riched32/tests/editor.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index cb5db77..8e0388c 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -868,11 +868,19 @@ static void test_word_wrap(void) res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); ok(res, "WM_SETTEXT failed.\n"); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); DestroyWindow(hwnd); hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, @@ -882,17 +890,29 @@ static void test_word_wrap(void) res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); ok(res, "WM_SETTEXT failed.\n"); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); /* Test the effect of EM_SETTARGETDEVICE on word wrap. */ res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 1); ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 0); ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res);

1 0

Stefan Dösinger : wined3d: Don' t set unloaded arrays to zero.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 3f5936f6f7dc5560e0ad56e25bd0c9c421f0fba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5936f6f7dc5560e0ad56e25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 31 16:38:05 2009 +0200 wined3d: Don't set unloaded arrays to zero. This causes memory corruption on MacOS, even if the app does not reference undeclared arrays. Trying to avoid potential breakage in broken apps which provoke undefined behavior is pointless if it causes actual breakage in well-behaved apps (on ill-behaved drivers). --- dlls/wined3d/state.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1e09385..c468d2b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3828,14 +3828,6 @@ static inline void unload_numbered_array(IWineD3DStateBlockImpl *stateblock, Win { GL_EXTCALL(glDisableVertexAttribArrayARB(i)); checkGLcall("glDisableVertexAttribArrayARB(reg)"); - /* Some Windows drivers(NV GF 7) use the latest value that was used when drawing with the now - * deactivated stream disabled, some other drivers(ATI, NV GF 8) set the undefined values to 0x00. - * Let's set them to 0x00 to avoid hitting some undefined aspects of OpenGL. All that is really - * important here is the glDisableVertexAttribArrayARB call above. The test shows that the refrast - * keeps dereferencing the pointers, which would cause crashes in some games like Half Life 2: Episode Two. - */ - GL_EXTCALL(glVertexAttrib4NubARB(i, 0, 0, 0, 0)); - checkGLcall("glVertexAttrib4NubARB(i, 0, 0, 0, 0)"); context->numbered_array_mask &= ~(1 << i); }

1 0

Stefan Dösinger : wined3d: A small atifs bump map improvement.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 8e259d9fcdaaa75a9086d0d2e58d71375c61b38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e259d9fcdaaa75a9086d0d2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 29 23:01:07 2009 +0200 wined3d: A small atifs bump map improvement. Thanks to Roland Scheidegger from Tungsten Graphics for the suggestion to replace the 2 movs + dp2add with two MADs, where one can conveniently be coissued with the other dp2add. --- dlls/wined3d/ati_fragment_shader.c | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1baf9ba..1f6f203 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -423,13 +423,6 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con GL_EXTCALL(glPassTexCoordATI(GL_REG_0_ATI + stage + 1, GL_TEXTURE0_ARB + stage + 1, swizzle)); - - /* We need GL_REG_5_ATI as a temporary register to swizzle the bump matrix. So we run into - * issues if we're bump mapping on stage 4 or 5 - */ - if(stage >= 4) { - FIXME("Bump mapping in stage %d\n", stage); - } } /* Pass 2: Generate perturbation calculations */ @@ -460,22 +453,24 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con ATI_FFP_CONST_BUMPMAT(stage), GL_NONE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI, GL_REG_0_ATI + stage + 1, GL_RED, GL_NONE); - /* FIXME: How can I make GL_DOT2_ADD_ATI read the factors from blue and alpha? It defaults to red and green, - * and it is fairly easy to make it read GL_BLUE or BL_ALPHA, but I can't get an R * B + G * A. So we're wasting - * one register and two instructions in this pass for a simple swizzling operation. - * For starters it might be good enough to merge the two movs into one, but even that isn't possible :-( + /* Don't use GL_DOT2_ADD_ATI here because we cannot configure it to read the blue and alpha + * component of the bump matrix. Instead do this with two MADs: + * + * coord.a = tex.r * bump.b + coord.g + * coord.g = tex.g * bump.a + coord.a * - * NOTE: GL_BLUE | GL_ALPHA is not possible. It doesn't throw a compilation error, but an OR operation on the - * constants doesn't make sense, considering their values. + * The first instruction writes to alpha so it can be coissued with the above DOT2_ADD. + * coord.a is unused. If the perturbed texture is projected, this was already handled + * in the glPassTexCoordATI above. */ - wrap_op1(gl_info, GL_MOV_ATI, GL_REG_5_ATI, GL_RED_BIT_ATI, GL_NONE, - ATI_FFP_CONST_BUMPMAT(stage), GL_BLUE, GL_NONE); - wrap_op1(gl_info, GL_MOV_ATI, GL_REG_5_ATI, GL_GREEN_BIT_ATI, GL_NONE, - ATI_FFP_CONST_BUMPMAT(stage), GL_ALPHA, GL_NONE); - wrap_op3(gl_info, GL_DOT2_ADD_ATI, GL_REG_0_ATI + stage + 1, GL_GREEN_BIT_ATI, GL_NONE, - GL_REG_0_ATI + stage, GL_NONE, argmodextra_y, - GL_REG_5_ATI, GL_NONE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI, + wrap_op3(gl_info, GL_MAD_ATI, GL_REG_0_ATI + stage + 1, GL_ALPHA, GL_NONE, + GL_REG_0_ATI + stage, GL_RED, argmodextra_y, + ATI_FFP_CONST_BUMPMAT(stage), GL_BLUE, GL_NONE, GL_REG_0_ATI + stage + 1, GL_GREEN, GL_NONE); + wrap_op3(gl_info, GL_MAD_ATI, GL_REG_0_ATI + stage + 1, GL_GREEN_BIT_ATI, GL_NONE, + GL_REG_0_ATI + stage, GL_GREEN, argmodextra_y, + ATI_FFP_CONST_BUMPMAT(stage), GL_ALPHA, GL_NONE, + GL_REG_0_ATI + stage + 1, GL_ALPHA, GL_NONE); } /* Pass 3: Generate sampling instructions for regular textures */

1 0

Stefan Dösinger : wined3d: Implement dsy in ARB.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 258d99d289dc2c2c7d6e9cca77e7cbf0d1c3fdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=258d99d289dc2c2c7d6e9cca7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 10 00:09:40 2009 -0700 wined3d: Implement dsy in ARB. --- dlls/wined3d/arb_program_shader.c | 45 ++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1acea74..ac7ced4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -103,6 +103,7 @@ struct arb_ps_compiled_shader struct stb_const_desc luminanceconst[MAX_TEXTURES]; UINT int_consts[MAX_CONST_I]; char num_int_consts; + UINT ycorrection; }; struct arb_vs_compile_args @@ -321,6 +322,22 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->int_consts[i], val)); } } + + if(gl_shader->ycorrection != WINED3D_CONST_NUM_UNUSED) + { + /* ycorrection.x: Backbuffer height(onscreen) or 0(offscreen). + * ycorrection.y: -1.0(onscreen), 1.0(offscreen) + * ycorrection.z: 1.0 + * ycorrection.w: 0.0 + */ + float val[4]; + val[0] = deviceImpl->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; + val[1] = deviceImpl->render_offscreen ? 1.0 : -1.0; + val[2] = 1.0; + val[3] = 0.0; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->ycorrection, val)); + checkGLcall("y correction loading\n"); + } } static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) @@ -2027,6 +2044,22 @@ static void shader_hw_sgn(const struct wined3d_shader_instruction *ins) } } +static void shader_hw_dsy(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + char src[50]; + char dst[50]; + char dst_name[50]; + BOOL is_color; + + shader_arb_get_dst_param(ins, &ins->dst[0], dst); + shader_arb_get_src_param(ins, &ins->src[0], 0, src); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_name, &is_color); + + shader_addline(buffer, "DDY %s, %s;\n", dst, src); + shader_addline(buffer, "MUL%s %s, %s, ycorrection.y;\n", shader_arb_get_modifier(ins), dst, dst_name); +} + static void shader_hw_loop(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; @@ -2461,6 +2494,16 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } } + if(reg_maps->vpos || reg_maps->usesdsy) + { + compiled->ycorrection = next_local; + shader_addline(buffer, "PARAM ycorrection = program.local[%u];\n", next_local++); + } + else + { + compiled->ycorrection = WINED3D_CONST_NUM_UNUSED; + } + /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); @@ -3105,7 +3148,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DP4 */ shader_hw_map2gl, /* WINED3DSIH_DST */ shader_hw_map2gl, /* WINED3DSIH_DSX */ shader_hw_map2gl, - /* WINED3DSIH_DSY */ NULL, + /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_ELSE */ NULL, /* WINED3DSIH_ENDIF */ NULL, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop,

1 0

Stefan Dösinger : wined3d: Implement loops with the NV extensions.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 51cdc9d36146068f0b5711156e70b54d71a74e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cdc9d36146068f0b5711156… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 3 07:14:36 2009 +0200 wined3d: Implement loops with the NV extensions. --- dlls/wined3d/arb_program_shader.c | 379 ++++++++++++++++++++++++++++++------- 1 files changed, 313 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51cdc9d36146068f0b571…

1 0

Stefan Dösinger :=?UTF-8?Q?=20=C2=A0wined3d?=: Store the bumpmap ARB constants in ARB structures.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 298bd3c50da3fd181ba73a5c139c45ef8d0db743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298bd3c50da3fd181ba73a5c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 14:14:12 2009 -0700 wined3d: Store the bumpmap ARB constants in ARB structures. --- dlls/wined3d/arb_program_shader.c | 149 +++++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 31 +++----- dlls/wined3d/wined3d_private.h | 8 -- 3 files changed, 97 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=298bd3c50da3fd181ba73…

1 0

Henri Verbeet : wined3d: Use the format info for doing compressed surface blits in BltFast().
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: e83fa982ca2b2686945f3cbeb0117a56703dc30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83fa982ca2b2686945f3cbeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:05 2009 +0200 wined3d: Use the format info for doing compressed surface blits in BltFast(). --- dlls/wined3d/surface_base.c | 46 +++++++++--------------------------------- 1 files changed, 10 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 50faf9a..407a6db 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1650,65 +1650,39 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst dEntry = This->resource.format_desc; } - /* Handle first the FOURCC surfaces... */ - if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_FOURCC) + /* Handle compressed surfaces first... */ + if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT block_width; - UINT block_height; - UINT block_byte_size; UINT row_block_count; - TRACE("Fourcc -> Fourcc copy\n"); + TRACE("compressed -> compressed copy\n"); if (trans) - FIXME("trans arg not supported when a FOURCC surface is involved\n"); + FIXME("trans arg not supported when a compressed surface is involved\n"); if (dstx || dsty) FIXME("offset for destination surface is not supported\n"); if (Src->resource.format_desc->format != This->resource.format_desc->format) { - FIXME("FOURCC->FOURCC copy only supported for the same type of surface\n"); + FIXME("compressed -> compressed copy only supported for the same type of surface\n"); ret = WINED3DERR_WRONGTEXTUREFORMAT; goto error; } - if (This->resource.format_desc->format == WINED3DFMT_DXT1) - { - block_width = 4; - block_height = 4; - block_byte_size = 8; - } - else if (This->resource.format_desc->format == WINED3DFMT_DXT2 - || This->resource.format_desc->format == WINED3DFMT_DXT3 - || This->resource.format_desc->format == WINED3DFMT_DXT4 - || This->resource.format_desc->format == WINED3DFMT_DXT5) - { - block_width = 4; - block_height = 4; - block_byte_size = 16; - } - else - { - FIXME("Unsupported FourCC format %s.\n", debug_d3dformat(This->resource.format_desc->format)); - block_width = 1; - block_height = 1; - block_byte_size = This->resource.format_desc->byte_count; - } - - row_block_count = (w + block_width - 1) / block_width; - for (y = 0; y < h; y += block_height) + row_block_count = (w + dEntry->block_width - 1) / dEntry->block_width; + for (y = 0; y < h; y += dEntry->block_height) { - memcpy(dbuf, sbuf, row_block_count * block_byte_size); + memcpy(dbuf, sbuf, row_block_count * dEntry->block_byte_count); dbuf += dlock.Pitch; sbuf += slock.Pitch; } goto error; } - if ((sEntry->Flags & WINED3DFMT_FLAG_FOURCC) && !(dEntry->Flags & WINED3DFMT_FLAG_FOURCC)) + if ((sEntry->Flags & WINED3DFMT_FLAG_COMPRESSED) && !(dEntry->Flags & WINED3DFMT_FLAG_COMPRESSED)) { /* TODO: Use the libtxc_dxtn.so shared library to do * software decompression */ - ERR("DXTC decompression not supported by now\n"); + ERR("Software decompression not supported.\n"); goto error; }

1 0

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 June 2009