August 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : winebuild: Add win32/ win64 generic architectures in addition to specific CPUs.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 3f7d342cfa8514d1ca1dfbe1ae47f132e44a2d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7d342cfa8514d1ca1dfbe1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 12:49:07 2009 +0200 winebuild: Add win32/win64 generic architectures in addition to specific CPUs. --- tools/winebuild/build.h | 2 ++ tools/winebuild/parser.c | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 7ca10c1..07ac347 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -145,6 +145,8 @@ extern enum target_platform target_platform; #define FLAG_CPU(cpu) (0x01000 << (cpu)) #define FLAG_CPU_MASK 0x1f000 +#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64)) +#define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64) #define MAX_ORDINALS 65535 diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 59640d8..642ccac 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -435,13 +435,20 @@ static const char *parse_spec_flags( ORDDEF *odp ) char *cpu_name = strtok( args, "," ); while (cpu_name) { - enum target_cpu cpu = get_cpu_from_name( cpu_name ); - if (cpu == -1) + if (!strcmp( cpu_name, "win32" )) + odp->flags |= FLAG_CPU_WIN32; + else if (!strcmp( cpu_name, "win64" )) + odp->flags |= FLAG_CPU_WIN64; + else { - error( "Unknown architecture '%s'\n", cpu_name ); - return NULL; + enum target_cpu cpu = get_cpu_from_name( cpu_name ); + if (cpu == -1) + { + error( "Unknown architecture '%s'\n", cpu_name ); + return NULL; + } + odp->flags |= FLAG_CPU( cpu ); } - odp->flags |= FLAG_CPU( cpu ); cpu_name = strtok( NULL, "," ); } free( args );

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderTopWidth.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 6c706261809d9eefaf8725c6d9d9dad6c7c27fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c706261809d9eefaf8725c6d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 22 20:32:59 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_borderTopWidth. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f1af7f2..e27cba7 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -279,8 +279,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderLeftStyle(IHTMLCurrentStyle *if static HRESULT WINAPI HTMLCurrentStyle_get_borderTopWidth(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_TOP_WIDTH, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_borderRightWidth(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e139706..c2852cc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2632,6 +2632,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderBottomWidth failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_borderTopWidth(current_style, &v); + ok(hres == S_OK, "get_borderTopWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderBottomWidth.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: f2c491dc95898cffbf2edb0782e225c17f443fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c491dc95898cffbf2edb078… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 22 20:30:14 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_borderBottomWidth. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 92d0fda..f1af7f2 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -293,8 +293,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderRightWidth(IHTMLCurrentStyle *i static HRESULT WINAPI HTMLCurrentStyle_get_borderBottomWidth(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_BOTTOM_WIDTH, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_borderLeftWidth(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 097db70..e139706 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2627,6 +2627,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderRightWidth failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_borderBottomWidth(current_style, &v); + ok(hres == S_OK, "get_borderBottomWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement HTMLCurrentStyle_get_borderRightWidth.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: e050a7b713b77c7890297802e9fc34488003f96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e050a7b713b77c7890297802e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 22 20:28:09 2009 +1000 mshtml: Implement HTMLCurrentStyle_get_borderRightWidth. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index b02fc7a..92d0fda 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -286,8 +286,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderTopWidth(IHTMLCurrentStyle *ifa static HRESULT WINAPI HTMLCurrentStyle_get_borderRightWidth(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_WIDTH, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_borderBottomWidth(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dd2c63a..097db70 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2621,6 +2621,12 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderLeftWidth failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + V_BSTR(&v) = NULL; + hres = IHTMLCurrentStyle_get_borderRightWidth(current_style, &v); + ok(hres == S_OK, "get_borderRightWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Dylan Smith : makedep: Handle non-overwriting rename for Windows.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 8e0b17462b2524ad1583d81597435517b8b1856e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0b17462b2524ad1583d8159… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Aug 22 01:57:47 2009 -0400 makedep: Handle non-overwriting rename for Windows. --- tools/makedep.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e2ca5ad..60278a9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -960,7 +960,14 @@ static void output_dependencies(void) if (tmp_name) { - if (rename( tmp_name, OutputFileName ) == -1) + int ret = rename( tmp_name, OutputFileName ); + if (ret == -1 && errno == EEXIST) + { + /* rename doesn't overwrite on windows */ + unlink( OutputFileName ); + ret = rename( tmp_name, OutputFileName ); + } + if (ret == -1) { unlink( tmp_name ); fatal_error( "failed to rename output file to '%s'\n", OutputFileName );

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in state_colormat().
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 7823679e20ca38085196848e4c764599c6f2ba37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7823679e20ca38085196848e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 24 09:27:55 2009 +0200 wined3d: Properly check if an attribute is used in state_colormat(). --- dlls/wined3d/state.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8b4eb8f..0bbd917 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1177,8 +1177,6 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; GLenum Parm = 0; - const struct wined3d_stream_info_element *diffuse = &device->strided_streams.elements[WINED3D_FFP_DIFFUSE]; - BOOL isDiffuseSupplied; /* Depends on the decoded vertex declaration to read the existence of diffuse data. * The vertex declaration will call this function if the fixed function pipeline is used. @@ -1188,10 +1186,10 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru return; } - isDiffuseSupplied = diffuse->data || diffuse->buffer_object; - context->num_untracked_materials = 0; - if (isDiffuseSupplied && stateblock->renderState[WINED3DRS_COLORVERTEX]) { + if ((device->strided_streams.use_map & (1 << WINED3D_FFP_DIFFUSE)) + && stateblock->renderState[WINED3DRS_COLORVERTEX]) + { TRACE("diff %d, amb %d, emis %d, spec %d\n", stateblock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE], stateblock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE],

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in drawStridedSlowVs().
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: c1c58f85cad7e7dea1a8839fd62ef67044c0d263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c58f85cad7e7dea1a8839fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 24 09:27:54 2009 +0200 wined3d: Properly check if an attribute is used in drawStridedSlowVs(). --- dlls/wined3d/drawprim.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a2a4620..643b098 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -451,8 +451,9 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream } } - for(i = MAX_ATTRIBS - 1; i >= 0; i--) { - if(!si->elements[i].data) continue; + for (i = MAX_ATTRIBS - 1; i >= 0; i--) + { + if (!(si->use_map & (1 << i))) continue; ptr = si->elements[i].data + si->elements[i].stride * SkipnStrides +

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in buffer_check_attribute().
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 16b0c6a0fd54a7d9a6481636ab5502e1fb123050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b0c6a0fd54a7d9a6481636a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 24 09:27:53 2009 +0200 wined3d: Properly check if an attribute is used in buffer_check_attribute(). --- dlls/wined3d/buffer.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 157b218..11a365a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -198,17 +198,20 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, return ret; } -static BOOL buffer_check_attribute(struct wined3d_buffer *This, - const struct wined3d_stream_info_element *attrib, const BOOL check_d3dcolor, const BOOL is_ffp_position, - const BOOL is_ffp_color, DWORD *stride_this_run, BOOL *float16_used) +static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, + UINT attrib_idx, const BOOL check_d3dcolor, const BOOL is_ffp_position, const BOOL is_ffp_color, + DWORD *stride_this_run, BOOL *float16_used) { + const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; BOOL ret = FALSE; WINED3DFORMAT format; /* Ignore attributes that do not have our vbo. After that check we can be sure that the attribute is * there, on nonexistent attribs the vbo is 0. */ - if (attrib->buffer_object != This->buffer_object) return FALSE; + if (!(si->use_map & (1 << attrib_idx)) + || attrib->buffer_object != This->buffer_object) + return FALSE; format = attrib->format_desc->format; /* Look for newly appeared conversion */ @@ -306,6 +309,7 @@ static UINT *find_conversion_shift(struct wined3d_buffer *This, static BOOL buffer_find_decl(struct wined3d_buffer *This) { IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + const struct wined3d_stream_info *si = &device->strided_streams; UINT stride_this_run = 0; BOOL float16_used = FALSE; BOOL ret = FALSE; @@ -393,8 +397,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) } for (i = 0; i < MAX_ATTRIBS; ++i) { - ret = buffer_check_attribute(This, &device->strided_streams.elements[i], - FALSE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; + ret = buffer_check_attribute(This, si, i, FALSE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; } /* Recalculate the conversion shift map if the declaration has changed, @@ -403,7 +406,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) if (ret && (float16_used || This->conversion_map)) { HeapFree(GetProcessHeap(), 0, This->conversion_shift); - This->conversion_shift = find_conversion_shift(This, &device->strided_streams, This->stride); + This->conversion_shift = find_conversion_shift(This, si, This->stride); } } else @@ -413,29 +416,29 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) * the attributes that our current fixed function pipeline implementation cares for. */ BOOL support_d3dcolor = GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA); - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_POSITION], + ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, TRUE, TRUE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_NORMAL], + ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_DIFFUSE], + ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, !support_d3dcolor, FALSE, TRUE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_SPECULAR], + ret = buffer_check_attribute(This, si, WINED3D_FFP_SPECULAR, !support_d3dcolor, FALSE, TRUE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_TEXCOORD0], + ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD0, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_TEXCOORD1], + ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD1, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_TEXCOORD2], + ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD2, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_TEXCOORD3], + ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD3, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_TEXCOORD4], + ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD4, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_TEXCOORD5], + ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD5, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_TEXCOORD6], + ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD6, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; - ret = buffer_check_attribute(This, &device->strided_streams.elements[WINED3D_FFP_TEXCOORD7], + ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD7, TRUE, FALSE, FALSE, &stride_this_run, &float16_used) || ret; if (float16_used) FIXME("Float16 conversion used with fixed function vertex processing\n");

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in loadTexCoords().
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 850232810d546204597b06d410e71b47974ae221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850232810d546204597b06d41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 24 09:27:52 2009 +0200 wined3d: Properly check if an attribute is used in loadTexCoords(). --- dlls/wined3d/state.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e9fd804..8b4eb8f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3140,14 +3140,14 @@ static void loadTexCoords(const struct wined3d_context *context, IWineD3DStateBl for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; - const struct wined3d_stream_info_element *e; mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; if (mapped_stage == WINED3D_UNMAPPED_STAGE) continue; - e = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx]; - if (coordIdx < MAX_TEXTURES && (e->data || e->buffer_object)) + if (coordIdx < MAX_TEXTURES && (si->use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx)))) { + const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx]; + TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", textureNo, mapped_stage, coordIdx, e->data);

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in loadVertexData().
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: e48350a4713a5503213d224ba42ac0cd1120be8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48350a4713a5503213d224ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 24 09:27:51 2009 +0200 wined3d: Properly check if an attribute is used in loadVertexData(). --- dlls/wined3d/state.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 97f1f79..e9fd804 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4144,11 +4144,11 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB stateblock->wineD3DDevice->instancedDraw = FALSE; /* Blend Data ---------------------------------------------- */ - e = &si->elements[WINED3D_FFP_BLENDWEIGHT]; - if (e->data || e->buffer_object - || si->elements[WINED3D_FFP_BLENDINDICES].data - || si->elements[WINED3D_FFP_BLENDINDICES].buffer_object) + if ((si->use_map & (1 << WINED3D_FFP_BLENDWEIGHT)) + || si->use_map & (1 << WINED3D_FFP_BLENDINDICES)) { + e = &si->elements[WINED3D_FFP_BLENDWEIGHT]; + if (GL_SUPPORT(ARB_VERTEX_BLEND)) { TRACE("Blend %d %p %d\n", e->format_desc->component_count, e->data + stateblock->loadBaseVertexIndex * e->stride, e->stride + offset[e->stream_idx]); @@ -4175,8 +4175,7 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB checkGLcall("glWeightPointerARB"); - if (si->elements[WINED3D_FFP_BLENDINDICES].data - || (si->elements[WINED3D_FFP_BLENDINDICES].buffer_object)) + if (si->use_map & (1 << WINED3D_FFP_BLENDINDICES)) { static BOOL warned; if (!warned) @@ -4200,8 +4199,7 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB } /* Point Size ----------------------------------------------*/ - e = &si->elements[WINED3D_FFP_PSIZE]; - if (e->data || e->buffer_object) + if (si->use_map & (1 << WINED3D_FFP_PSIZE)) { /* no such functionality in the fixed function GL pipeline */ TRACE("Cannot change ptSize here in openGl\n"); @@ -4209,11 +4207,11 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB } /* Vertex Pointers -----------------------------------------*/ - e = &si->elements[WINED3D_FFP_POSITION]; - if (e->data || e->buffer_object) + if (si->use_map & (1 << WINED3D_FFP_POSITION)) { VTRACE(("glVertexPointer(%d, GL_FLOAT, %d, %p)\n", e->stride, e->size, e->data)); + e = &si->elements[WINED3D_FFP_POSITION]; if (curVBO != e->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, e->buffer_object)); @@ -4243,10 +4241,11 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB } /* Normals -------------------------------------------------*/ - e = &si->elements[WINED3D_FFP_NORMAL]; - if (e->data || e->buffer_object) + if (si->use_map & (1 << WINED3D_FFP_NORMAL)) { VTRACE(("glNormalPointer(GL_FLOAT, %d, %p)\n", e->stride, e->data)); + + e = &si->elements[WINED3D_FFP_NORMAL]; if (curVBO != e->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, e->buffer_object)); @@ -4273,11 +4272,11 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB /* NOTE: Unless we write a vertex shader to swizzle the colour*/ /* , or the user doesn't care and wants the speed advantage */ - e = &si->elements[WINED3D_FFP_DIFFUSE]; - if (e->data || e->buffer_object) + if (si->use_map & (1 << WINED3D_FFP_DIFFUSE)) { VTRACE(("glColorPointer(4, GL_UNSIGNED_BYTE, %d, %p)\n", e->stride, e->data)); + e = &si->elements[WINED3D_FFP_DIFFUSE]; if (curVBO != e->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, e->buffer_object)); @@ -4297,12 +4296,12 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB } /* Specular Colour ------------------------------------------*/ - e = &si->elements[WINED3D_FFP_SPECULAR]; - if (e->data || e->buffer_object) + if (si->use_map & (1 << WINED3D_FFP_SPECULAR)) { TRACE("setting specular colour\n"); VTRACE(("glSecondaryColorPointer(4, GL_UNSIGNED_BYTE, %d, %p)\n", e->stride, e->data)); + e = &si->elements[WINED3D_FFP_SPECULAR]; if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { GLenum type = e->format_desc->gl_vtx_type; GLint format = e->format_desc->gl_vtx_format;

1 0