February 2007 - Wine-commits

Stefan Dösinger : wined3d: Do not use glMapBuffer in ProcessVertices.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: a72b561947ed485b8a2ca661eac49a9caa542383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72b561947ed485b8a2ca661e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 23:00:02 2007 +0100 wined3d: Do not use glMapBuffer in ProcessVertices. --- dlls/wined3d/device.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bee6650..82873c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3345,7 +3345,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShaderConstantF( #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, WineDirect3DVertexStridedData *lpStrideData, DWORD SrcFVF, IWineD3DVertexBufferImpl *dest, DWORD dwFlags) { - char *dest_ptr, *dest_conv = NULL; + char *dest_ptr, *dest_conv = NULL, *dest_conv_addr = NULL; unsigned int i; DWORD DestFVF = dest->fvf; WINED3DVIEWPORT vp; @@ -3396,12 +3396,12 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } if(dest->vbo) { - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->vbo)); - dest_conv = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB)); - if(!dest_conv) { - ERR("glMapBuffer failed\n"); + dest_conv_addr = HeapAlloc(GetProcessHeap(), 0, dwCount * get_flexible_vertex_size(DestFVF)); + if(!dest_conv_addr) { + ERR("Out of memory\n"); /* Continue without storing converted vertices */ } + dest_conv = dest_conv_addr; } /* Should I clip? @@ -3425,9 +3425,6 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } } else doClip = FALSE; dest_ptr = ((char *) dest->resource.allocatedMemory) + dwDestIndex * get_flexible_vertex_size(DestFVF); - if(dest_conv) { - dest_conv = ((char *) dest_conv) + dwDestIndex * get_flexible_vertex_size(DestFVF); - } IWineD3DDevice_GetTransform( (IWineD3DDevice *) This, WINED3DTS_VIEW, @@ -3680,8 +3677,13 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } if(dest_conv) { - GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); - checkGLcall("glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)"); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->vbo)); + checkGLcall("glBindBufferARB(GL_ARRAY_BUFFER_ARB)"); + GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, dwDestIndex * get_flexible_vertex_size(DestFVF), + dwCount * get_flexible_vertex_size(DestFVF), + dest_conv_addr)); + checkGLcall("glBufferSubDataARB(GL_ARRAY_BUFFER_ARB)"); + HeapFree(GetProcessHeap(), 0, dest_conv_addr); } LEAVE_GL();

1 0

Stefan Dösinger : wined3d: Remove dead code from drawprim.c.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 2a90bc2c7adaaf4d4183406e7ea7bffae79e0731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a90bc2c7adaaf4d4183406e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 22:48:05 2007 +0100 wined3d: Remove dead code from drawprim.c. --- dlls/wined3d/drawprim.c | 278 ----------------------------------------------- 1 files changed, 0 insertions(+), 278 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a90bc2c7adaaf4d41834…

1 0

Stefan Dösinger : wined3d: Index buffer fixes.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: efc03f0a34354a55142b9a8291e47f1c41b89da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc03f0a34354a55142b9a829… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 22:46:31 2007 +0100 wined3d: Index buffer fixes. --- dlls/ddraw/device.c | 2 +- dlls/ddraw/direct3d.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/indexbuffer.c | 9 +++++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c201df7..0814921 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3691,7 +3691,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, */ hr = IWineD3DIndexBuffer_Lock(This->indexbuffer, 0 /* OffSetToLock */, - 0 /* SizeToLock - doesn't matter */, + IndexCount * sizeof(WORD), (BYTE **) &LockedIndices, 0 /* Flags */); assert(IndexCount < 0x100000); diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 4896ba7..b716a60 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -804,7 +804,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, */ hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, 0x40000, /* Length. Don't know how long it should be */ - 0, /* Usage */ + WINED3DUSAGE_DYNAMIC, /* Usage */ WINED3DFMT_INDEX16, /* Format. D3D7 uses WORDS */ WINED3DPOOL_DEFAULT, &object->indexbuffer, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c039798..2ac8797 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4294,7 +4294,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * UINT idxStride = 2; IWineD3DIndexBuffer *pIB; WINED3DINDEXBUFFER_DESC IdxBufDsc; - GLint vbo; + GLuint vbo; pIB = This->stateBlock->pIndexData; This->stateBlock->streamIsUP = FALSE; diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index b16ddd0..ae2294a 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -60,8 +60,11 @@ static ULONG WINAPI IWineD3DIndexBufferImpl_Release(IWineD3DIndexBuffer *iface) if (ref == 0) { if(This->vbo) { ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); + /* No need to manually unset the buffer. glDeleteBuffers unsets it for the current context, + * but not for other contexts. However, because the d3d buffer is destroyed the app has to + * unset it before doing the next draw, thus dirtifying the index buffer state and forcing + * binding a new buffer + */ GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); checkGLcall("glDeleteBuffersARB"); LEAVE_GL(); @@ -159,6 +162,8 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_Unlock(IWineD3DIndexBuffer *iface) LEAVE_GL(); This->dirtystart = 0; This->dirtyend = 0; + /* TODO: Move loading into preload when the buffer is used, that avoids dirtifying the state */ + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_INDEXBUFFER); } return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Use CopyRect / EqualRect.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: ca04a9de34f56674e08027a3a77c21ceabbc9650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca04a9de34f56674e08027a3a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 22:47:38 2007 +0100 wined3d: Use CopyRect / EqualRect. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2ac8797..bee6650 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2813,11 +2813,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, C This->updateStateBlock->set.scissorRect = TRUE; This->updateStateBlock->changed.scissorRect = TRUE; - if(memcmp(&This->updateStateBlock->scissorRect, pRect, sizeof(*pRect)) == 0) { + if(EqualRect(&This->updateStateBlock->scissorRect, pRect)) { TRACE("App is setting the old scissor rectangle over, nothing to do\n"); return WINED3D_OK; } - memcpy(&This->updateStateBlock->scissorRect, pRect, sizeof(*pRect)); + CopyRect(&This->updateStateBlock->scissorRect, pRect); if(This->isRecordingState) { TRACE("Recording... not performing anything\n");

1 0

Stefan Dösinger : wined3d: Floating point shader constant setting.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: dd93e1fb7f1d889ff40eac8c3a2e8caaf195b836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd93e1fb7f1d889ff40eac8c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 22:43:53 2007 +0100 wined3d: Floating point shader constant setting. Test how shader constant limits are checked in Set*ShaderConstantF. The vertex shader tests it based on the limits reported in the caps, the pixel shader tests tries to find the limit manually because I could not find a cap structure member specifying the pixel shader constant limit. Set*ShaderConstantF returns an error as soon as start or start + count are bigger than the constant limit. --- dlls/d3d9/tests/shader.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 34 ++++++++++++++++----------- 2 files changed, 77 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index f15ad77..9c34043 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -109,6 +109,33 @@ static void test_get_set_vertex_shader(IDirect3DDevice9 *device_ptr) "Expected hret 0x%x, current_shader_ptr %p, refcount %d.\n", hret, current_shader_ptr, shader_refcount, D3D_OK, shader_ptr, i); } +static void test_vertex_shader_constant(IDirect3DDevice9 *device_ptr, DWORD consts) +{ + float c[4] = { 0.0, 0.0, 0.0, 0.0 }; + float d[16] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }; + HRESULT hr; + + /* A simple check that the stuff works at all */ + hr = IDirect3DDevice9_SetVertexShaderConstantF(device_ptr, 0, c, 1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShaderConstantF returned 0x%08x\n", hr); + + /* Test corner cases: Write to const MAX - 1, MAX, MAX + 1, and writing 4 consts from + * MAX - 1 + */ + hr = IDirect3DDevice9_SetVertexShaderConstantF(device_ptr, consts - 1, c, 1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShaderConstantF returned 0x%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device_ptr, consts + 0, c, 1); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetVertexShaderConstantF returned 0x%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device_ptr, consts + 1, c, 1); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetVertexShaderConstantF returned 0x%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device_ptr, consts - 1, d, 4); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetVertexShaderConstantF returned 0x%08x\n", hr); + + /* Constant -1 */ + hr = IDirect3DDevice9_SetVertexShaderConstantF(device_ptr, -1, c, 1); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetVertexShaderConstantF returned 0x%08x\n", hr); +} + static void test_get_set_pixel_shader(IDirect3DDevice9 *device_ptr) { static DWORD simple_ps[] = {0xFFFF0101, /* ps_1_1 */ @@ -146,6 +173,33 @@ static void test_get_set_pixel_shader(IDirect3DDevice9 *device_ptr) "Expected hret 0x%x, current_shader_ptr %p, refcount %d.\n", hret, current_shader_ptr, shader_refcount, D3D_OK, shader_ptr, i); } +static void test_pixel_shader_constant(IDirect3DDevice9 *device_ptr) +{ + float c[4] = { 0.0, 0.0, 0.0, 0.0 }; + float d[16] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }; + HRESULT hr; + DWORD consts = 0; + + /* A simple check that the stuff works at all */ + hr = IDirect3DDevice9_SetPixelShaderConstantF(device_ptr, 0, c, 1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShaderConstantF returned 0x%08x\n", hr); + + /* Is there really no max pixel shader constant value??? Test how far I can go */ + while(SUCCEEDED(IDirect3DDevice9_SetPixelShaderConstantF(device_ptr, consts++, c, 1))); + consts = consts - 1; + trace("SetPixelShaderConstantF was able to set %d shader constants\n", consts); + + /* Test corner cases: writing 4 consts from MAX - 1, everything else is pointless + * given the way the constant limit was found out + */ + hr = IDirect3DDevice9_SetPixelShaderConstantF(device_ptr, consts - 1, d, 4); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetPixelShaderConstantF returned 0x%08x\n", hr); + + /* Constant -1 */ + hr = IDirect3DDevice9_SetPixelShaderConstantF(device_ptr, -1, c, 1); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetPixelShaderConstantF returned 0x%08x\n", hr); +} + START_TEST(shader) { D3DCAPS9 caps; @@ -166,12 +220,15 @@ START_TEST(shader) if (caps.VertexShaderVersion & 0xffff) { test_get_set_vertex_shader(device_ptr); + test_vertex_shader_constant(device_ptr, caps.MaxVertexShaderConst); } else skip("No vertex shader support\n"); if (caps.PixelShaderVersion & 0xffff) { test_get_set_pixel_shader(device_ptr); + /* No max pixel shader constant value??? */ + test_pixel_shader_constant(device_ptr); } else skip("No pixel shader support\n"); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 05b4852..08860ae 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3012,20 +3012,23 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantF( UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i, cnt = min(count, GL_LIMITS(vshader_constantsF) - start); + int i; TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); - if (srcData == NULL || ((signed int) GL_LIMITS(vshader_constantsF) - (signed int) start) <= (signed int) 0) + /* Specifically test start > limit to catch MAX_UINT overflows when adding start + count */ + if (srcData == NULL || start + count > GL_LIMITS(vshader_constantsF) || start > GL_LIMITS(vshader_constantsF)) return WINED3DERR_INVALIDCALL; - memcpy(&This->updateStateBlock->vertexShaderConstantF[start * 4], srcData, cnt * sizeof(float) * 4); - for (i = 0; i < cnt; i++) - TRACE("Set FLOAT constant %u to { %f, %f, %f, %f }\n", start + i, - srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); + memcpy(&This->updateStateBlock->vertexShaderConstantF[start * 4], srcData, count * sizeof(float) * 4); + if(TRACE_ON(d3d)) { + for (i = 0; i < count; i++) + TRACE("Set FLOAT constant %u to { %f, %f, %f, %f }\n", start + i, + srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); + } - for (i = start; i < cnt + start; ++i) { + for (i = start; i < count + start; ++i) { if (!This->updateStateBlock->set.vertexShaderConstantsF[i]) { constant_entry *ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(constant_entry)); ptr->idx = i; @@ -3289,20 +3292,23 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF( UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i, cnt = min(count, GL_LIMITS(pshader_constantsF) - start); + int i; TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); - if (srcData == NULL || cnt < 0) + /* Specifically test start > limit to catch MAX_UINT overflows when adding start + count */ + if (srcData == NULL || start + count > GL_LIMITS(pshader_constantsF) || start > GL_LIMITS(pshader_constantsF)) return WINED3DERR_INVALIDCALL; - memcpy(&This->updateStateBlock->pixelShaderConstantF[start * 4], srcData, cnt * sizeof(float) * 4); - for (i = 0; i < cnt; i++) - TRACE("Set FLOAT constant %u to { %f, %f, %f, %f }\n", start + i, - srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); + memcpy(&This->updateStateBlock->pixelShaderConstantF[start * 4], srcData, count * sizeof(float) * 4); + if(TRACE_ON(d3d)) { + for (i = 0; i < count; i++) + TRACE("Set FLOAT constant %u to { %f, %f, %f, %f }\n", start + i, + srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); + } - for (i = start; i < cnt + start; ++i) { + for (i = start; i < count + start; ++i) { if (!This->updateStateBlock->set.pixelShaderConstantsF[i]) { constant_entry *ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(constant_entry)); ptr->idx = i;

1 0

Stefan Dösinger : wined3d: IWineD3DDevice::Clear fixes .
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: e935600ebc7892bdd48993ecf2455cf10c0d2b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e935600ebc7892bdd48993ecf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 22:44:12 2007 +0100 wined3d: IWineD3DDevice::Clear fixes. Fix the use of the scissor test in Clear. The rectangle is only set if a clearing rectangle is used, otherwise the scissor test is disabled (the pixel ownsership test should take care of the window boarders). To get the scissor test back to the value the app set up Clear dirtifies the state(s). --- dlls/wined3d/device.c | 38 ++++++++++---------------------------- 1 files changed, 10 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 08860ae..07f91ce 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4167,10 +4167,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun render target does not have an attached depth buffer. Similarly, if you specify the WINED3DCLEAR_STENCIL flag when the depth-buffer format does not contain stencil buffer information, this method fails. */ GLbitfield glMask = 0; - GLboolean old_ztest; - GLfloat old_z_clear_value; - GLint old_stencil_clear_value; - GLfloat old_color_clear_value[4]; unsigned int i; CONST WINED3DRECT* curRect; @@ -4179,8 +4175,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun ENTER_GL(); - glEnable(GL_SCISSOR_TEST); - checkGLcall("glEnable GL_SCISSOR_TEST"); + if(pRects) { + glEnable(GL_SCISSOR_TEST); + checkGLcall("glEnable GL_SCISSOR_TEST"); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); + } else { + glDisable(GL_SCISSOR_TEST); + checkGLcall("glEnable GL_SCISSOR_TEST"); + } + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); if (Count > 0 && pRects) { curRect = pRects; @@ -4190,7 +4193,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun /* Only set the values up once, as they are not changing */ if (Flags & WINED3DCLEAR_STENCIL) { - glGetIntegerv(GL_STENCIL_CLEAR_VALUE, &old_stencil_clear_value); glClearStencil(Stencil); checkGLcall("glClearStencil"); glMask = glMask | GL_STENCIL_BUFFER_BIT; @@ -4198,17 +4200,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun } if (Flags & WINED3DCLEAR_ZBUFFER) { - glGetBooleanv(GL_DEPTH_WRITEMASK, &old_ztest); glDepthMask(GL_TRUE); - glGetFloatv(GL_DEPTH_CLEAR_VALUE, &old_z_clear_value); glClearDepth(Z); checkGLcall("glClearDepth"); glMask = glMask | GL_DEPTH_BUFFER_BIT; + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); } if (Flags & WINED3DCLEAR_TARGET) { TRACE("Clearing screen with glClear to color %x\n", Color); - glGetFloatv(GL_COLOR_CLEAR_VALUE, old_color_clear_value); glClearColor(D3DCOLOR_R(Color), D3DCOLOR_G(Color), D3DCOLOR_B(Color), @@ -4232,13 +4232,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun glScissor(curRect->x1, (((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height - curRect->y2), curRect->x2 - curRect->x1, curRect->y2 - curRect->y1); checkGLcall("glScissor"); - } else { - glScissor(This->stateBlock->viewport.X, - (((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height - - (This->stateBlock->viewport.Y + This->stateBlock->viewport.Height)), - This->stateBlock->viewport.Width, - This->stateBlock->viewport.Height); - checkGLcall("glScissor"); } /* Clear the selected rectangle (or full screen) */ @@ -4251,26 +4244,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun /* Restore the old values (why..?) */ if (Flags & WINED3DCLEAR_STENCIL) { - glClearStencil(old_stencil_clear_value); glStencilMask(This->stateBlock->renderState[WINED3DRS_STENCILWRITEMASK]); } - if (Flags & WINED3DCLEAR_ZBUFFER) { - glDepthMask(old_ztest); - glClearDepth(old_z_clear_value); - } if (Flags & WINED3DCLEAR_TARGET) { - glClearColor(old_color_clear_value[0], - old_color_clear_value[1], - old_color_clear_value[2], - old_color_clear_value[3]); glColorMask(This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE, This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE, This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & WINED3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE, This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE); } - glDisable(GL_SCISSOR_TEST); - checkGLcall("glDisable"); LEAVE_GL(); /* Dirtify the target surface for now. If the surface is locked regularily, and an up to date sysmem copy exists,

1 0

Stefan Dösinger : wined3d: Clean up sampler usage in UpdateSurface.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 6d66347cf908a4dbafd2ae0cdede6db53c82fdb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d66347cf908a4dbafd2ae0cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 22:44:45 2007 +0100 wined3d: Clean up sampler usage in UpdateSurface. UpdateSurface has to modify one gl texture unit to bind the texture to load. To restore the correct properties for drawing gl texture unit 0 is activated and dirtified. --- dlls/wined3d/device.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 07f91ce..c039798 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4701,8 +4701,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, int offset = 0; int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ glDescriptor *glDescription = NULL; - GLenum textureDimensions = GL_TEXTURE_2D; - IWineD3DBaseTexture *baseTexture; WINED3DSURFACE_DESC winedesc; @@ -4736,13 +4734,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); } + ENTER_GL(); + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + checkGLcall("glActiveTextureARB"); + } + /* Make sure the surface is loaded and up to date */ IWineD3DSurface_PreLoad(pDestinationSurface); IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription); - ENTER_GL(); - /* this needs to be done in lines if the sourceRect != the sourceWidth */ srcWidth = pSourceRect ? pSourceRect->right - pSourceRect->left : srcSurfaceWidth; srcHeight = pSourceRect ? pSourceRect->top - pSourceRect->bottom : srcSurfaceHeight; @@ -4847,19 +4849,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, } } checkGLcall("glTexSubImage2D"); - ((IWineD3DSurfaceImpl *)pDestinationSurface)->Flags |= SFLAG_GLDIRTY; - - /* I only need to look up baseTexture here, so it may be a good idea to hava a GL_TARGET -> - * GL_DIMENSIONS lookup, or maybe store the dimensions on the surface (but that's making the - * surface bigger than it needs to be hmm.. */ - if (WINED3D_OK == IWineD3DSurface_GetContainer(pDestinationSurface, &IID_IWineD3DBaseTexture, (void **)&baseTexture)) { - textureDimensions = IWineD3DBaseTexture_GetTextureDimensions(baseTexture); - IWineD3DBaseTexture_Release(baseTexture); - } - glDisable(textureDimensions); /* This needs to be managed better.... */ LEAVE_GL(); + ((IWineD3DSurfaceImpl *)pDestinationSurface)->Flags |= SFLAG_GLDIRTY; + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(0)); + return WINED3D_OK; }

1 0

Dmitry Timoshkov : user32: Add a CreateIcon test, make it pass under Wine.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 1936fd99ee884a38a758bbeb481aace83167e9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1936fd99ee884a38a758bbeb4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 21 16:19:40 2007 +0800 user32: Add a CreateIcon test, make it pass under Wine. --- dlls/user32/cursoricon.c | 2 +- dlls/user32/tests/cursoricon.c | 141 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index e17d4c6..1d6101a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1841,7 +1841,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) else { info->nWidth = bmpAnd.bmWidth; - info->nHeight = bmpAnd.bmHeight * 2; + info->nHeight = bmpAnd.bmHeight / 2; info->nWidthBytes = get_bitmap_width_bytes(bmpAnd.bmWidth, 1); info->bPlanes = 1; info->bBitsPerPixel = 1; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index be0da20..6d93138 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1,6 +1,8 @@ -/* Unit test suite for cursors and icons. +/* + * Unit test suite for cursors and icons. * * Copyright 2006 Michael Kaufmann + * Copyright 2007 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -235,6 +237,142 @@ static void test_CopyImage_Bitmap(int depth) HeapFree(GetProcessHeap(), 0, info); } +static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_bpp, int line) +{ + ICONINFO info; + DWORD ret; + BITMAP bmMask, bmColor; + + ret = GetIconInfo(hIcon, &info); + ok_(__FILE__, line)(ret, "GetIconInfo failed\n"); + + /* CreateIcon under XP causes info.fIcon to be 0 */ + ok_(__FILE__, line)(info.xHotspot == exp_cx/2, "info.xHotspot = %u\n", info.xHotspot); + ok_(__FILE__, line)(info.yHotspot == exp_cy/2, "info.yHotspot = %u\n", info.yHotspot); + ok_(__FILE__, line)(info.hbmMask != 0, "info.hbmMask is NULL\n"); + + ret = GetObject(info.hbmMask, sizeof(bmMask), &bmMask); + ok_(__FILE__, line)(ret == sizeof(bmMask), "GetObject(info.hbmMask) failed, ret %u\n", ret); + + if (exp_bpp == 1) + ok_(__FILE__, line)(info.hbmColor == 0, "info.hbmColor should be NULL\n"); + + if (info.hbmColor) + { + HDC hdc; + UINT display_bpp; + + hdc = GetDC(0); + display_bpp = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); + + ret = GetObject(info.hbmColor, sizeof(bmColor), &bmColor); + ok_(__FILE__, line)(ret == sizeof(bmColor), "GetObject(info.hbmColor) failed, ret %u\n", ret); + + ok_(__FILE__, line)(bmColor.bmBitsPixel == display_bpp /* XP */ || + bmColor.bmBitsPixel == exp_bpp /* Win98 */, + "bmColor.bmBitsPixel = %d\n", bmColor.bmBitsPixel); + ok_(__FILE__, line)(bmColor.bmWidth == exp_cx, "bmColor.bmWidth = %d\n", bmColor.bmWidth); + ok_(__FILE__, line)(bmColor.bmHeight == exp_cy, "bmColor.bmHeight = %d\n", bmColor.bmHeight); + + ok_(__FILE__, line)(bmMask.bmBitsPixel == 1, "bmMask.bmBitsPixel = %d\n", bmMask.bmBitsPixel); + ok_(__FILE__, line)(bmMask.bmWidth == exp_cx, "bmMask.bmWidth = %d\n", bmMask.bmWidth); + ok_(__FILE__, line)(bmMask.bmHeight == exp_cy, "bmMask.bmHeight = %d\n", bmMask.bmHeight); + } + else + { + ok_(__FILE__, line)(bmMask.bmBitsPixel == 1, "bmMask.bmBitsPixel = %d\n", bmMask.bmBitsPixel); + ok_(__FILE__, line)(bmMask.bmWidth == exp_cx, "bmMask.bmWidth = %d\n", bmMask.bmWidth); + ok_(__FILE__, line)(bmMask.bmHeight == exp_cy * 2, "bmMask.bmHeight = %d\n", bmMask.bmHeight); + } +} + +#define test_icon_info(a,b,c,d) test_icon_info_dbg((a),(b),(c),(d),__LINE__) + +static void test_CreateIcon(void) +{ + static const BYTE bmp_bits[1024]; + HICON hIcon; + HBITMAP hbmMask, hbmColor; + ICONINFO info; + HDC hdc; + UINT display_bpp; + + hdc = GetDC(0); + display_bpp = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); + + /* these crash under XP + hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, NULL); + hIcon = CreateIcon(0, 16, 16, 1, 1, NULL, bmp_bits); + */ + + hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, bmp_bits); + ok(hIcon != 0, "CreateIcon failed\n"); + test_icon_info(hIcon, 16, 16, 1); + DestroyIcon(hIcon); + + hIcon = CreateIcon(0, 16, 16, 1, display_bpp, bmp_bits, bmp_bits); + ok(hIcon != 0, "CreateIcon failed\n"); + test_icon_info(hIcon, 16, 16, display_bpp); + DestroyIcon(hIcon); + + hbmMask = CreateBitmap(16, 16, 1, 1, bmp_bits); + ok(hbmMask != 0, "CreateBitmap failed\n"); + hbmColor = CreateBitmap(16, 16, 1, display_bpp, bmp_bits); + ok(hbmColor != 0, "CreateBitmap failed\n"); + + info.fIcon = TRUE; + info.xHotspot = 8; + info.yHotspot = 8; + info.hbmMask = 0; + info.hbmColor = 0; + SetLastError(0xdeadbeaf); + hIcon = CreateIconIndirect(&info); + ok(!hIcon, "CreateIconIndirect should fail\n"); + ok(GetLastError() == 0xdeadbeaf, "wrong error %u\n", GetLastError()); + + info.fIcon = TRUE; + info.xHotspot = 8; + info.yHotspot = 8; + info.hbmMask = 0; + info.hbmColor = hbmColor; + SetLastError(0xdeadbeaf); + hIcon = CreateIconIndirect(&info); + ok(!hIcon, "CreateIconIndirect should fail\n"); + ok(GetLastError() == 0xdeadbeaf, "wrong error %u\n", GetLastError()); + + info.fIcon = TRUE; + info.xHotspot = 8; + info.yHotspot = 8; + info.hbmMask = hbmMask; + info.hbmColor = hbmColor; + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + test_icon_info(hIcon, 16, 16, display_bpp); + DestroyIcon(hIcon); + + DeleteObject(hbmMask); + DeleteObject(hbmColor); + + hbmMask = CreateBitmap(16, 32, 1, 1, bmp_bits); + ok(hbmMask != 0, "CreateBitmap failed\n"); + + info.fIcon = TRUE; + info.xHotspot = 8; + info.yHotspot = 8; + info.hbmMask = hbmMask; + info.hbmColor = 0; + SetLastError(0xdeadbeaf); + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + test_icon_info(hIcon, 16, 16, 1); + DestroyIcon(hIcon); + + DeleteObject(hbmMask); + DeleteObject(hbmColor); +} + START_TEST(cursoricon) { test_CopyImage_Bitmap(1); @@ -243,4 +381,5 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_CreateIcon(); }

1 0

Stefan Dösinger : wined3d: Do not print the fixed / unfixed vertices warning with shaders.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: fb1469c47db6c9dbaf7a302d1122a8f84cdde77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1469c47db6c9dbaf7a302d1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 22:42:34 2007 +0100 wined3d: Do not print the fixed / unfixed vertices warning with shaders. --- dlls/wined3d/drawprim.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9162c01..0a2ec8e 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -178,7 +178,6 @@ void primitiveDeclarationConvertToStridedData( TRACE("Stream is up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]); streamVBO = 0; data = (BYTE *)This->stateBlock->streamSource[element->Stream]; - if(fixup && *fixup) FIXME("Missing fixed and unfixed vertices, expect graphics glitches\n"); } else { TRACE("Stream isn't up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]); if(!isPreLoaded[element->Stream]) { @@ -189,7 +188,10 @@ void primitiveDeclarationConvertToStridedData( data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0, &streamVBO); if(fixup) { if( streamVBO != 0) *fixup = TRUE; - else if(*fixup) FIXME("Missing fixed and unfixed vertices, expect graphics glitches\n"); + else if(*fixup && This->stateBlock->vertexShader == NULL) { + /* This may be bad with the fixed function pipeline */ + FIXME("Missing fixed and unfixed vertices, expect graphics glitches\n"); + } } } stride = This->stateBlock->streamStride[element->Stream];

1 0

Stefan Dösinger : wined3d: Light parameter fixes.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 76b7cac7af4a7da1505a831890397b2d9dc94ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b7cac7af4a7da1505a83189… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 22:43:13 2007 +0100 wined3d: Light parameter fixes. --- dlls/ddraw/tests/d3d.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 31 +++++++++++++++++++++++++ dlls/wined3d/state.c | 29 ++++++++++++++++------- 3 files changed, 110 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index bb37f08..1125875 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -218,6 +218,65 @@ static void LightTest(void) /* Light 23 has not been set */ rc = IDirect3DDevice7_GetLightEnable(lpD3DDevice, 23, &bEnabled ); ok(rc==DDERR_INVALIDPARAMS, "GetLightEnable returned: %x\n", rc); + + /* Set some lights with invalid parameters */ + memset(&light, 0, sizeof(D3DLIGHT7)); + light.dltType = 0; + U1(light.dcvDiffuse).r = 1.f; + U2(light.dcvDiffuse).g = 1.f; + U3(light.dcvDiffuse).b = 1.f; + U3(light.dvDirection).z = 1.f; + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 100, &light); + ok(rc==DDERR_INVALIDPARAMS, "SetLight returned: %x\n", rc); + + memset(&light, 0, sizeof(D3DLIGHT7)); + light.dltType = 12345; + U1(light.dcvDiffuse).r = 1.f; + U2(light.dcvDiffuse).g = 1.f; + U3(light.dcvDiffuse).b = 1.f; + U3(light.dvDirection).z = 1.f; + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 101, &light); + ok(rc==DDERR_INVALIDPARAMS, "SetLight returned: %x\n", rc); + + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 102, NULL); + ok(rc==DDERR_INVALIDPARAMS, "SetLight returned: %x\n", rc); + + memset(&light, 0, sizeof(D3DLIGHT7)); + light.dltType = D3DLIGHT_SPOT; + U1(light.dcvDiffuse).r = 1.f; + U2(light.dcvDiffuse).g = 1.f; + U3(light.dcvDiffuse).b = 1.f; + U3(light.dvDirection).z = 1.f; + + U3(light.dvAttenuation0) = -1.0 / 0.0; /* -INFINITY */ + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); + ok(rc==DDERR_INVALIDPARAMS, "SetLight returned: %x\n", rc); + + U3(light.dvAttenuation0) = -1.0; + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); + ok(rc==DDERR_INVALIDPARAMS, "SetLight returned: %x\n", rc); + + U3(light.dvAttenuation0) = 0.0; + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); + ok(rc==D3D_OK, "SetLight returned: %x\n", rc); + + U3(light.dvAttenuation0) = 1.0; + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); + ok(rc==D3D_OK, "SetLight returned: %x\n", rc); + + U3(light.dvAttenuation0) = 1.0 / 0.0; /* +INFINITY */ + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); + ok(rc==D3D_OK, "SetLight returned: %x\n", rc); + + U3(light.dvAttenuation0) = 0.0 / 0.0; /* NaN */ + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); + ok(rc==D3D_OK, "SetLight returned: %x\n", rc); + + /* Directional light ignores attenuation */ + light.dltType = D3DLIGHT_DIRECTIONAL; + U3(light.dvAttenuation0) = -1.0; + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); + ok(rc==D3D_OK, "SetLight returned: %x\n", rc); } static void ProcessVerticesTest(void) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index af0e96a..05b4852 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2199,6 +2199,37 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : Idx(%d), pLight(%p). Hash index is %d\n", This, Index, pLight, Hi); + /* Check the parameter range. Need for speed most wanted sets junk lights which confuse + * the gl driver. + */ + if(!pLight) { + WARN("Light pointer = NULL, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + switch(pLight->Type) { + case WINED3DLIGHT_POINT: + case WINED3DLIGHT_SPOT: + case WINED3DLIGHT_PARALLELPOINT: + case WINED3DLIGHT_GLSPOT: + /* Incorrect attenuation values can cause the gl driver to crash. Happens with Need for speed + * most wanted + */ + if(pLight->Attenuation0 < 0.0 || pLight->Attenuation1 < 0.0 || pLight->Attenuation2 < 0.0) { + WARN("Attenuation is negative, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + break; + + case WINED3DLIGHT_DIRECTIONAL: + /* Ignores attenuation */ + break; + + default: + WARN("Light type out of range, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + LIST_FOR_EACH(e, &This->updateStateBlock->lightMap[Hi]) { object = LIST_ENTRY(e, PLIGHTINFOEL, entry); if(object->OriginalIndex == Index) break; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1a73b57..2b76dff 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2981,21 +2981,16 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContex glLightfv(GL_LIGHT0 + Index, GL_AMBIENT, colRGBA); checkGLcall("glLightfv"); - /* Attenuation - Are these right? guessing... */ - glLightf(GL_LIGHT0 + Index, GL_CONSTANT_ATTENUATION, lightInfo->OriginalParms.Attenuation0); - checkGLcall("glLightf"); - glLightf(GL_LIGHT0 + Index, GL_LINEAR_ATTENUATION, lightInfo->OriginalParms.Attenuation1); - checkGLcall("glLightf"); - if ((lightInfo->OriginalParms.Range *lightInfo->OriginalParms.Range) >= FLT_MIN) { quad_att = 1.4/(lightInfo->OriginalParms.Range *lightInfo->OriginalParms.Range); } else { quad_att = 0; /* 0 or MAX? (0 seems to be ok) */ } - if (quad_att < lightInfo->OriginalParms.Attenuation2) quad_att = lightInfo->OriginalParms.Attenuation2; - glLightf(GL_LIGHT0 + Index, GL_QUADRATIC_ATTENUATION, quad_att); - checkGLcall("glLightf"); + /* Do not assign attenuation values for lights that do not use them. D3D apps are free to pass any junk, + * but gl drivers use them and may crash due to bad Attenuation values. Need for Speed most wanted sets + * Attenuation0 to NaN and crashes in the gl lib + */ switch (lightInfo->OriginalParms.Type) { case WINED3DLIGHT_POINT: @@ -3004,6 +2999,14 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContex checkGLcall("glLightfv"); glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf"); + /* Attenuation - Are these right? guessing... */ + glLightf(GL_LIGHT0 + Index, GL_CONSTANT_ATTENUATION, lightInfo->OriginalParms.Attenuation0); + checkGLcall("glLightf"); + glLightf(GL_LIGHT0 + Index, GL_LINEAR_ATTENUATION, lightInfo->OriginalParms.Attenuation1); + checkGLcall("glLightf"); + if (quad_att < lightInfo->OriginalParms.Attenuation2) quad_att = lightInfo->OriginalParms.Attenuation2; + glLightf(GL_LIGHT0 + Index, GL_QUADRATIC_ATTENUATION, quad_att); + checkGLcall("glLightf"); /* FIXME: Range */ break; @@ -3018,6 +3021,14 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContex checkGLcall("glLightf"); glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf"); + /* Attenuation - Are these right? guessing... */ + glLightf(GL_LIGHT0 + Index, GL_CONSTANT_ATTENUATION, lightInfo->OriginalParms.Attenuation0); + checkGLcall("glLightf"); + glLightf(GL_LIGHT0 + Index, GL_LINEAR_ATTENUATION, lightInfo->OriginalParms.Attenuation1); + checkGLcall("glLightf"); + if (quad_att < lightInfo->OriginalParms.Attenuation2) quad_att = lightInfo->OriginalParms.Attenuation2; + glLightf(GL_LIGHT0 + Index, GL_QUADRATIC_ATTENUATION, quad_att); + checkGLcall("glLightf"); /* FIXME: Range */ break;

1 0