wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Stefan Dösinger : wined3d: Set WINED3D_BUFFER_CREATEBO in buffer_init().
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 1bd98719e6bcf02185b34ba6246d0aad4570236e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd98719e6bcf02185b34ba62… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 28 00:31:12 2009 +0100 wined3d: Set WINED3D_BUFFER_CREATEBO in buffer_init(). --- dlls/wined3d/buffer.c | 25 +++++++++++++++++++++++++ dlls/wined3d/device.c | 26 ++------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c5b8b44..ceeede0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1098,6 +1098,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, { const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, &device->adapter->gl_info); HRESULT hr; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; if (!size) { @@ -1119,6 +1120,30 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); + /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + + * drawStridedFast (half-life 2 and others). + * + * Basically converting the vertices in the buffer is quite expensive, and observations + * show that drawStridedSlow is faster than converting + uploading + drawStridedFast. + * Therefore do not create a VBO for WINED3DUSAGE_DYNAMIC buffers. + */ + if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) + { + TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); + } + else if(buffer->resource.pool == WINED3DPOOL_SYSTEMMEM) + { + TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); + } + else if(buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + { + TRACE("Not creating a vbo because the buffer has dynamic usage\n"); + } + else + { + buffer->flags |= WINED3D_BUFFER_CREATEBO; + } + if (data) { BYTE *ptr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78db960..34495d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -520,23 +520,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("Created buffer %p.\n", object); *ppVertexBuffer = (IWineD3DBuffer *)object; - /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + - * drawStridedFast (half-life 2). - * - * Basically converting the vertices in the buffer is quite expensive, and observations - * show that drawStridedSlow is faster than converting + uploading + drawStridedFast. - * Therefore do not create a VBO for WINED3DUSAGE_DYNAMIC buffers. - */ - if (!This->adapter->gl_info.supported[ARB_VERTEX_BUFFER_OBJECT]) - { - TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); - } else if(Pool == WINED3DPOOL_SYSTEMMEM) { - TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); - } else if(Usage & WINED3DUSAGE_DYNAMIC) { - TRACE("Not creating a vbo because the buffer has dynamic usage\n"); - } else { - object->flags |= WINED3D_BUFFER_CREATEBO; - } return WINED3D_OK; } @@ -560,7 +543,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface } hr = buffer_init(object, This, Length, Usage | WINED3DUSAGE_STATICDECL, - WINED3DFMT_UNKNOWN, Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, parent, parent_ops); + WINED3DFMT_UNKNOWN, Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, + parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize buffer, hr %#x\n", hr); @@ -570,12 +554,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface TRACE("Created buffer %p.\n", object); - if (Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) - && This->adapter->gl_info.supported[ARB_VERTEX_BUFFER_OBJECT]) - { - object->flags |= WINED3D_BUFFER_CREATEBO; - } - *ppIndexBuffer = (IWineD3DBuffer *) object; return WINED3D_OK;

1 0

Stefan Dösinger : wined3d: Revert the GL usage confusion.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b9976c3d207d86dcc853f21c82b7e0fe81483825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9976c3d207d86dcc853f21c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 17 18:11:20 2009 +0100 wined3d: Revert the GL usage confusion. This is functionally a revert of 8eeb513b1a0e7a4f7963612f0305850499c9ec7d. The language of the extension is slightly confusing to me, but GL_STREAM_*_ARB is more dynamic than GL_DYNAMIC_*_ARB. So use GL_STREAM usage for D3DUSAGE_DYNAMIC buffers and GL_DYNAMIC usage for non-dynamic buffers. --- dlls/wined3d/buffer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 51e594d..c5b8b44 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -85,13 +85,13 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) */ if(This->resource.usage & WINED3DUSAGE_DYNAMIC) { - TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); - gl_usage = GL_DYNAMIC_DRAW_ARB; + TRACE("Gl usage = GL_STREAM_DRAW_ARB\n"); + gl_usage = GL_STREAM_DRAW_ARB; } else { - TRACE("Gl usage = GL_STREAM_DRAW\n"); - gl_usage = GL_STREAM_DRAW_ARB; + TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n"); + gl_usage = GL_DYNAMIC_DRAW_ARB; } /* Reserve memory for the buffer. The amount of data won't change

1 0

Gerald Pfeifer : include: Move WINED3DTS_WORLD et al directly into _WINED3DTRANSFORMSTATETYPE.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: feecb8ebaf3ea57e07a770170ee183fb03a82b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feecb8ebaf3ea57e07a770170… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 3 19:45:41 2010 +0100 include: Move WINED3DTS_WORLD et al directly into _WINED3DTRANSFORMSTATETYPE. --- include/wine/wined3d.idl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index c91437a..6364f9c 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -716,12 +716,12 @@ typedef enum _WINED3DTRANSFORMSTATETYPE WINED3DTS_TEXTURE5 = 21, WINED3DTS_TEXTURE6 = 22, WINED3DTS_TEXTURE7 = 23, + WINED3DTS_WORLD = 256, /*WINED3DTS_WORLDMATRIX(0)*/ + WINED3DTS_WORLD1 = 257, + WINED3DTS_WORLD2 = 258, + WINED3DTS_WORLD3 = 259, WINED3DTS_FORCE_DWORD = 0x7fffffff } WINED3DTRANSFORMSTATETYPE; -cpp_quote("#define WINED3DTS_WORLD WINED3DTS_WORLDMATRIX(0)") -cpp_quote("#define WINED3DTS_WORLD1 WINED3DTS_WORLDMATRIX(1)") -cpp_quote("#define WINED3DTS_WORLD2 WINED3DTS_WORLDMATRIX(2)") -cpp_quote("#define WINED3DTS_WORLD3 WINED3DTS_WORLDMATRIX(3)") cpp_quote("#define WINED3DTS_WORLDMATRIX(index) (WINED3DTRANSFORMSTATETYPE)(index + 256)") typedef enum _WINED3DBASISTYPE

1 0

Gerald Pfeifer : wined3d: Introduce WINED3DFMT_INST and use it in CheckTextureCapability().
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 0cf44ae02ef4f6169d28dd23beaf76719e8cc247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf44ae02ef4f6169d28dd23b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 3 17:23:43 2010 +0100 wined3d: Introduce WINED3DFMT_INST and use it in CheckTextureCapability(). --- dlls/wined3d/directx.c | 2 +- include/wine/wined3d.idl | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0e6880..c4c272a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3124,7 +3124,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, * * With Shader Model 3.0 capable cards Instancing 'just works' in Windows. */ - case WINEMAKEFOURCC('I','N','S','T'): + case WINED3DFMT_INST: TRACE("ATI Instancing check hack\n"); if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_VERTEX_SHADER]) { diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 16ae443..c91437a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -266,6 +266,7 @@ typedef enum _WINED3DFORMAT WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */ WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */ WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */ + WINED3DFMT_INST = 0x54534e49, /* INST */ WINED3DFMT_NVHU = 0x5548564e, /* NVHU */ WINED3DFMT_NVHS = 0x5348564e, /* NVHS */

1 0

Marcus Meissner : kernel32: Check if buffer is NULL before derefencing it ( Coverity).
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: a55399f5b65942a4959b1b5aeab34a47192be7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55399f5b65942a4959b1b5ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 3 14:46:07 2010 +0100 kernel32: Check if buffer is NULL before derefencing it (Coverity). --- dlls/kernel32/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index b5f7c0f..26c6736 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1171,7 +1171,7 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, retW = GetPrivateProfileStringW( sectionW.Buffer, entryW.Buffer, def_valW.Buffer, bufferW, len, filenameW.Buffer); - if (len) + if (len && buffer) { if (retW) {

1 0

Marcus Meissner : krnl386.exe: Removed unused owner_exists variable ( Coverity).
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b53b7f1ec3f5286c3e855baccb25e3d48030a2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53b7f1ec3f5286c3e855bacc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 3 13:33:56 2010 +0100 krnl386.exe: Removed unused owner_exists variable (Coverity). --- dlls/krnl386.exe16/ne_module.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 08ed94c..15d43bf 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -967,7 +967,6 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ const char *file_name = NULL; char dllname[32], *p; const char *basename, *main_module; - int owner_exists = FALSE; /* strip path information */ @@ -1042,7 +1041,6 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ TRACE("Trying native dll '%s'\n", libname); hinst = NE_LoadModule(libname, lib_only); if (hinst > 32) TRACE_(loaddll)("Loaded module %s : native\n", debugstr_a(libname)); - if (hinst == ERROR_FILE_NOT_FOUND && owner_exists) hinst = 21; /* win32 module */ } if (hinst > 32 && !implicit)

1 0

Vincent Povirk : gdiplus: Reset the lock count when unlocking a bitmap in write mode.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 7afd9603b5c2cb452484f2d07ef3839d60dbd94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afd9603b5c2cb452484f2d07… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 1 14:55:54 2010 -0600 gdiplus: Reset the lock count when unlocking a bitmap in write mode. --- dlls/gdiplus/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 41030ed..9227751 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -578,6 +578,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, { /* we passed a direct reference; no need to do anything */ bitmap->lockmode = 0; + bitmap->numlocks = 0; return Ok; } @@ -608,6 +609,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GdipFree(bitmap->bitmapbits); bitmap->bitmapbits = NULL; bitmap->lockmode = 0; + bitmap->numlocks = 0; return Ok; }

1 0

Vincent Povirk : gdiplus: Add traces to unimplemented functions in image.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 495c42b617dd78d78ef2d5b5279d8441fd72885c URL: http://source.winehq.org/git/wine.git/?a=commit;h=495c42b617dd78d78ef2d5b52… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:12:51 2009 -0600 gdiplus: Add traces to unimplemented functions in image.c. --- dlls/gdiplus/image.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4fd1a4f..41030ed 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -945,6 +945,9 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, { static int calls; + TRACE("(%p,%p,%p,%u,%s,%p)\n", ref, metafile, succ, emfType, + debugstr_w(description), out_metafile); + if(!ref || !metafile || !out_metafile) return InvalidParameter; @@ -1429,9 +1432,16 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage *image, ImageItemData* item) { + static int calls; + + TRACE("(%p,%p)\n", image, item); + if(!image || !item) return InvalidParameter; + if (!(calls++)) + FIXME("not implemented\n"); + return NotImplemented; } @@ -1729,6 +1739,8 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num) { static int calls; + TRACE("(%p,%p,%p)\n", image, size, num); + if(!(calls++)) FIXME("not implemented\n"); @@ -1753,6 +1765,8 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, { static int calls; + TRACE("(%p,%s,%p)\n", image, debugstr_guid(dimensionID), count); + if(!image || !dimensionID || !count) return InvalidParameter; @@ -2142,6 +2156,8 @@ GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage *image, PROPID propId) { static int calls; + TRACE("(%p,%u)\n", image, propId); + if(!image) return InvalidParameter; @@ -2155,6 +2171,8 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage *image, GDIPCONST PropertyItem* { static int calls; + TRACE("(%p,%p)\n", image, item); + if(!(calls++)) FIXME("not implemented\n"); @@ -2848,6 +2866,8 @@ GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, { static int calls; + TRACE("(%p,%p,%u)\n", effect, params, size); + if(!(calls++)) FIXME("not implemented\n");

1 0

Vincent Povirk : gdiplus: Add trace to GdipBitmapUnlockBits.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: d694679ab6c279bcca085880ba57d93b41a789f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d694679ab6c279bcca085880b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:07:12 2009 -0600 gdiplus: Add trace to GdipBitmapUnlockBits. --- dlls/gdiplus/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 78801fd..4fd1a4f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -554,6 +554,8 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, BOOL bm_is_selected; BITMAPINFO *pbmi; + TRACE("(%p,%p)\n", bitmap, lockeddata); + if(!bitmap || !lockeddata) return InvalidParameter;

1 0

Vincent Povirk : gdiplus: Add trace to unimplemented function in graphicspath.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 221bde44de2d815f2180d3e8b34582719de9737a URL: http://source.winehq.org/git/wine.git/?a=commit;h=221bde44de2d815f2180d3e8b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:05:36 2009 -0600 gdiplus: Add trace to unimplemented function in graphicspath.c. --- dlls/gdiplus/graphicspath.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 94e17dd..60ddda1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1380,6 +1380,8 @@ GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath* path, REAL x, REAL y, { static int calls; + TRACE("(%p,%0.2f,%0.2f,%p,%p,%p)\n", path, x, y, pen, graphics, result); + if(!path || !pen) return InvalidParameter;

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 January 2010