August 2008 - Wine-Commits - list.winehq.org

H. Verbeet : wined3d: Move setting the draw buffer to a separate function.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: f037eb86962b46185dcc57856d1ea52c1f2b29d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f037eb86962b46185dcc57856… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Aug 3 21:17:51 2008 +0200 wined3d: Move setting the draw buffer to a separate function. --- dlls/wined3d/context.c | 40 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bb354f6..3556714 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -871,7 +871,7 @@ static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchai * Returns: The needed context * *****************************************************************************/ -static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid, GLint *buffer) { +static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid) { IWineD3DSwapChain *swapchain = NULL; HRESULT hr; BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; @@ -907,11 +907,6 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf * rendering. No context change is needed in that case */ - if(((IWineD3DSwapChainImpl *) swapchain)->frontBuffer == target) { - *buffer = GL_FRONT; - } else { - *buffer = GL_BACK; - } if(wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) { if(This->pbufferContext && tid == This->pbufferContext->tid) { This->pbufferContext->tid = 0; @@ -930,7 +925,6 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } else { TRACE("Rendering offscreen\n"); This->render_offscreen = TRUE; - *buffer = This->offscreenBuffer; switch(wined3d_settings.offscreen_rendering_mode) { case ORM_FBO: @@ -1057,6 +1051,25 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf return context; } +static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target) +{ + HRESULT hr; + IWineD3DSwapChain *swapchain; + + hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); + if (SUCCEEDED(hr)) + { + IWineD3DSwapChain_Release((IUnknown *)swapchain); + glDrawBuffer(surface_get_gl_buffer(target, swapchain)); + checkGLcall("glDrawBuffers()"); + } + else + { + glDrawBuffer(This->offscreenBuffer); + checkGLcall("glDrawBuffer()"); + } +} + /***************************************************************************** * ActivateContext * @@ -1076,12 +1089,12 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU DWORD dirtyState, idx; BYTE shift; WineD3DContext *context; - GLint drawBuffer=0; const struct StateEntry *StateTable = This->StateTable; TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); if(This->lastActiveRenderTarget != target || tid != This->lastThread) { - context = FindContext(This, target, tid, &drawBuffer); + context = FindContext(This, target, tid); + context->draw_buffer_dirty = TRUE; This->lastActiveRenderTarget = target; This->lastThread = tid; } else { @@ -1121,13 +1134,10 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* We only need ENTER_GL for the gl calls made below and for the helper functions which make GL calls */ ENTER_GL(); - /* Select the right draw buffer. It is selected in FindContext. */ - if(drawBuffer && context->last_draw_buffer != drawBuffer) { - TRACE("Drawing to buffer: %#x\n", drawBuffer); - context->last_draw_buffer = drawBuffer; - glDrawBuffer(drawBuffer); - checkGLcall("glDrawBuffer"); + if (context->draw_buffer_dirty) { + apply_draw_buffer(This, target); + context->draw_buffer_dirty = FALSE; } switch(usage) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e798c1..33b48df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -591,7 +591,7 @@ struct WineD3DContext { DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ - GLint last_draw_buffer; + BOOL draw_buffer_dirty; BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */ BOOL last_was_pshader; BOOL last_was_vshader;

1 0

Piotr Caban : msxml3: Add implementation of ISAXAttributes_getURI.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 7be136bcd5802492d7382765b83b387d87eae1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be136bcd5802492d7382765b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Aug 3 14:37:52 2008 +0200 msxml3: Add implementation of ISAXAttributes_getURI. --- dlls/msxml3/saxreader.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b4e25f2..0cdd0c1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -612,9 +612,15 @@ static HRESULT WINAPI isaxattributes_getURI( int *pUriSize) { saxattributes *This = impl_from_ISAXAttributes( iface ); + TRACE("(%p)->(%d)\n", This, nIndex); - FIXME("(%p)->(%d) stub\n", This, nIndex); - return E_NOTIMPL; + if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; + if(!pUrl || !pUriSize) return E_POINTER; + + *pUriSize = SysStringLen(This->szURI[nIndex]); + *pUrl = This->szURI[nIndex]; + + return S_OK; } static HRESULT WINAPI isaxattributes_getLocalName(

1 0

Piotr Caban : msxml3: Add NULL pointers check in getLocalName, getQName and getValue.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 7a5a7819f86205ae16e7dd284a2fb3e853181e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5a7819f86205ae16e7dd284… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Aug 3 14:37:45 2008 +0200 msxml3: Add NULL pointers check in getLocalName, getQName and getValue. --- dlls/msxml3/saxreader.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b87576a..b4e25f2 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -626,7 +626,8 @@ static HRESULT WINAPI isaxattributes_getLocalName( saxattributes *This = impl_from_ISAXAttributes( iface ); TRACE("(%p)->(%d)\n", This, nIndex); - if(nIndex >= This->nb_attributes) return E_INVALIDARG; + if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; + if(!pLocalName || !pLocalNameLength) return E_POINTER; *pLocalNameLength = SysStringLen(This->szLocalname[nIndex]); *pLocalName = This->szLocalname[nIndex]; @@ -643,7 +644,8 @@ static HRESULT WINAPI isaxattributes_getQName( saxattributes *This = impl_from_ISAXAttributes( iface ); TRACE("(%p)->(%d)\n", This, nIndex); - if(nIndex >= This->nb_attributes) return E_INVALIDARG; + if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; + if(!pQName || !pQNameLength) return E_POINTER; *pQNameLength = SysStringLen(This->szQName[nIndex]); *pQName = This->szQName[nIndex]; @@ -744,7 +746,8 @@ static HRESULT WINAPI isaxattributes_getValue( saxattributes *This = impl_from_ISAXAttributes( iface ); TRACE("(%p)->(%d)\n", This, nIndex); - if(nIndex >= This->nb_attributes) return E_INVALIDARG; + if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; + if(!pValue || !nValue) return E_POINTER; *nValue = SysStringLen(This->szValue[nIndex]); *pValue = This->szValue[nIndex];

1 0

Stefan Dösinger : wined3d: Always load glFinish and glFlush from opengl32.dll.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: e9827cc916d09b7dba7ee11cb77ab50f24ff7a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9827cc916d09b7dba7ee11cb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 30 10:53:33 2008 -0500 wined3d: Always load glFinish and glFlush from opengl32.dll. --- dlls/wined3d/directx.c | 14 +++++++++++++- include/wine/wined3d_gl.h | 10 ++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9101ba8..5474a45 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3971,7 +3971,7 @@ void fillGLAttribFuncs(WineD3D_GL_Info *gl_info) { #define PUSH1(att) attribs[nAttribs++] = (att); BOOL InitAdapters(void) { - static HMODULE mod_gl; + static HMODULE mod_gl, mod_win32gl; BOOL ret; int ps_selected_mode, vs_selected_mode; @@ -3990,10 +3990,16 @@ BOOL InitAdapters(void) { ERR("Can't load opengl32.dll!\n"); goto nogl_adapter; } + mod_win32gl = mod_gl; #else #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */ mod_gl = GetModuleHandleA("gdi32.dll"); + mod_win32gl = LoadLibraryA("opengl32.dll"); + if(!mod_win32gl) { + ERR("Can't load opengl32.dll!\n"); + goto nogl_adapter; + } #endif } @@ -4011,6 +4017,12 @@ BOOL InitAdapters(void) { GL_FUNCS_GEN; #undef USE_GL_FUNC + /* Load glFinish and glFlush from opengl32.dll even if we're not using WIN32 opengl + * otherwise because we have to use winex11.drv's override + */ + glFinish = (void*)GetProcAddress(mod_win32gl, "glFinish"); + glFlush = (void*)GetProcAddress(mod_win32gl, "glFlush"); + /* For now only one default adapter */ { int iPixelFormat; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index ac4967d..7f0b640 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -890,8 +890,6 @@ void (WINE_GLAPI *glEvalMesh2) (GLenum mode, GLint i1, GLint i2, GLint j1, GLint void (WINE_GLAPI *glEvalPoint1) (GLint i); void (WINE_GLAPI *glEvalPoint2) (GLint i, GLint j); void (WINE_GLAPI *glFeedbackBuffer) (GLsizei size, GLenum type, GLfloat* buffer); -void (WINE_GLAPI *glFinish) (); -void (WINE_GLAPI *glFlush) (); void (WINE_GLAPI *glFogf) (GLenum pname, GLfloat param); void (WINE_GLAPI *glFogfv) (GLenum pname, const GLfloat* params); void (WINE_GLAPI *glFogi) (GLenum pname, GLint param); @@ -1139,6 +1137,12 @@ void (WINE_GLAPI *glVertexPointer) (GLint size, GLenum type, GLsizei stride, con void (WINE_GLAPI *glViewport) (GLint x, GLint y, GLsizei width, GLsizei height); void (WINE_GLAPI *glPointParameterfv) (GLenum pname, const GLfloat *params); +/* glFinish and glFlush are always loaded from opengl32.dll, thus they always have + * __stdcall calling convention + */ +void (__stdcall *glFinish) (); +void (__stdcall *glFlush) (); + /* WGL functions */ HGLRC (WINAPI *pwglCreateContext)(HDC); BOOL (WINAPI *pwglDeleteContext)(HGLRC); @@ -1238,8 +1242,6 @@ BOOL (WINAPI *pwglShareLists)(HGLRC,HGLRC); USE_GL_FUNC(glEvalPoint1) \ USE_GL_FUNC(glEvalPoint2) \ USE_GL_FUNC(glFeedbackBuffer) \ - USE_GL_FUNC(glFinish) \ - USE_GL_FUNC(glFlush) \ USE_GL_FUNC(glFogf) \ USE_GL_FUNC(glFogfv) \ USE_GL_FUNC(glFogi) \

1 0

Stefan Dösinger : d3d9: Skip gracefully if A16R16G16B16 is not supported.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: ef647c9ad95a24b1795be1d63141ef06cc10d4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef647c9ad95a24b1795be1d63… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 31 15:31:44 2008 -0500 d3d9: Skip gracefully if A16R16G16B16 is not supported. --- dlls/d3d9/tests/visual.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 60b1fad..7d79db2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5591,6 +5591,10 @@ static void pshader_version_varying_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_CreateTexture(device, 512, 512, 1, 0, D3DFMT_A16B16G16R16, D3DPOOL_MANAGED, &texture, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture returned %08x\n", hr); + if(FAILED(hr)) { + skip("D3DFMT_A16B16G16R16 textures not supported\n"); + return; + } hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture9_LockRect returned %08x\n", hr); for(y = 0; y < 512; y++) {

1 0

Piotr Caban : msxml3: Return QNames properly.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 319d86c733300c1c2282cf76c676d1a50b54e689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=319d86c733300c1c2282cf76c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Aug 3 14:37:37 2008 +0200 msxml3: Return QNames properly. --- dlls/msxml3/saxreader.c | 61 +++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 4bba5e6..b87576a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -81,7 +81,6 @@ typedef struct _saxattributes LONG ref; int nb_attributes; BSTR *szLocalname; - BSTR *szPrefix; BSTR *szURI; BSTR *szValue; BSTR *szQName; @@ -118,7 +117,7 @@ static inline saxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) } -BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) +static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) { DWORD dLen; LPWSTR str; @@ -140,6 +139,33 @@ BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) return bstr; } +static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) +{ + DWORD dLen, dLast; + LPWSTR str; + BSTR bstr; + + if(!name) return NULL; + + if(!prefix || *prefix=='\0') + return bstr_from_xmlChar(name); + + dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, NULL, 0) + + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0); + str = HeapAlloc(GetProcessHeap(), 0, dLen * sizeof(WCHAR)); + if(!str) + return NULL; + + dLast = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, str, dLen); + str[dLast-1] = ':'; + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &str[dLast], dLen-dLast); + bstr = SysAllocString(str); + + HeapFree(GetProcessHeap(), 0, str); + + return bstr; +} + static void format_error_message_from_id(saxlocator *This, HRESULT hr) { xmlStopParser(This->pParserCtxt); @@ -551,15 +577,15 @@ static ULONG WINAPI isaxattributes_Release(ISAXAttributes* iface) for(index=0; index<This->nb_attributes; index++) { SysFreeString(This->szLocalname[index]); - SysFreeString(This->szPrefix[index]); SysFreeString(This->szURI[index]); SysFreeString(This->szValue[index]); + SysFreeString(This->szQName[index]); } HeapFree(GetProcessHeap(), 0, This->szLocalname); - HeapFree(GetProcessHeap(), 0, This->szPrefix); HeapFree(GetProcessHeap(), 0, This->szURI); HeapFree(GetProcessHeap(), 0, This->szValue); + HeapFree(GetProcessHeap(), 0, This->szQName); HeapFree(GetProcessHeap(), 0, This); } @@ -793,8 +819,6 @@ static HRESULT SAXAttributes_create(saxattributes **attr, attributes->szLocalname = HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); - attributes->szPrefix = - HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); attributes->szURI = HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); attributes->szValue = @@ -802,12 +826,10 @@ static HRESULT SAXAttributes_create(saxattributes **attr, attributes->szQName = HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); - if(!attributes->szLocalname || !attributes->szPrefix - || !attributes->szURI || !attributes->szValue - || !attributes->szQName) + if(!attributes->szLocalname || !attributes->szURI + || !attributes->szValue || !attributes->szQName) { HeapFree(GetProcessHeap(), 0, attributes->szLocalname); - HeapFree(GetProcessHeap(), 0, attributes->szPrefix); HeapFree(GetProcessHeap(), 0, attributes->szURI); HeapFree(GetProcessHeap(), 0, attributes->szValue); HeapFree(GetProcessHeap(), 0, attributes->szQName); @@ -817,26 +839,15 @@ static HRESULT SAXAttributes_create(saxattributes **attr, for(index=0; index<nb_attributes; index++) { - int len1, len2; - attributes->szLocalname[index] = bstr_from_xmlChar(xmlAttributes[index*5]); - attributes->szPrefix[index] = - bstr_from_xmlChar(xmlAttributes[index*5+1]); attributes->szURI[index] = bstr_from_xmlChar(xmlAttributes[index*5+2]); attributes->szValue[index] = bstr_from_xmlCharN(xmlAttributes[index*5+3], xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); - - len1 = SysStringLen(attributes->szPrefix[index]); - len2 = SysStringLen(attributes->szLocalname[index]); - attributes->szQName[index] = SysAllocStringLen(NULL, len1+len2); - memcpy(attributes->szQName[index], attributes->szPrefix[index], - len1*sizeof(WCHAR)); - memcpy(attributes->szQName[index]+len1, - attributes->szLocalname[index], len2*sizeof(WCHAR)); - attributes->szQName[index][len1+len2] = '\0'; + attributes->szQName[index] = + QName_from_xmlChar(xmlAttributes[index*5+1], xmlAttributes[index*5]); } *attr = attributes; @@ -910,7 +921,7 @@ static void libxmlStartElementNS( { NamespaceUri = bstr_from_xmlChar(URI); LocalName = bstr_from_xmlChar(localname); - QName = bstr_from_xmlChar(localname); + QName = QName_from_xmlChar(prefix, localname); hr = SAXAttributes_create(&attr, nb_attributes, attributes); if(hr == S_OK) @@ -959,7 +970,7 @@ static void libxmlEndElementNS( { NamespaceUri = bstr_from_xmlChar(URI); LocalName = bstr_from_xmlChar(localname); - QName = bstr_from_xmlChar(localname); + QName = QName_from_xmlChar(prefix, localname); if(This->vbInterface) hr = IVBSAXContentHandler_endElement(

1 0

Stefan Dösinger : wined3d: Report the pitch alignment to ddraw.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 399825cd8e781723e30a5b0293e37f7872dabc37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399825cd8e781723e30a5b029… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Aug 2 18:06:01 2008 -0500 wined3d: Report the pitch alignment to ddraw. --- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ddb7102..9101ba8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3483,7 +3483,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINEDDSCAPS_SYSTEMMEMORY | WINEDDSCAPS_VIDEOMEMORY | WINEDDSCAPS_VISIBLE; - pCaps->DirectDrawCaps.StrideAlign = 0; /* TODO: SURFACE_ALIGNMENT */ + pCaps->DirectDrawCaps.StrideAlign = DDRAW_PITCH_ALIGNMENT; /* Set D3D caps if OpenGL is available. */ if(Adapters[Adapter].opengl) { @@ -3535,9 +3535,9 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, list_init(&object->shaders); if(This->dxVersion == 7) { - object->surface_alignment = 8; + object->surface_alignment = DDRAW_PITCH_ALIGNMENT; } else { - object->surface_alignment = 4; + object->surface_alignment = D3D8_PITCH_ALIGNMENT; } object->posFixup[0] = 1.0; /* This is needed to get the x coord unmodified through a MAD */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 453c92a..0e798c1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -835,6 +835,8 @@ struct IWineD3DDeviceImpl BOOL view_ident; /* true iff view matrix is identity */ BOOL untransformed; BOOL vertexBlendUsed; /* To avoid needless setting of the blend matrices */ +#define DDRAW_PITCH_ALIGNMENT 8 +#define D3D8_PITCH_ALIGNMENT 4 unsigned char surface_alignment; /* Line Alignment of surfaces */ /* State block related */

1 0

Stefan Dösinger : wined3d: Only set D3D caps when GL was loaded successfully.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 8ee4159e4f40112f26bd9aa747605316ea582684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee4159e4f40112f26bd9aa74… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 23 15:38:52 2008 -0500 wined3d: Only set D3D caps when GL was loaded successfully. --- dlls/wined3d/directx.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b5a8c0..ddb7102 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3457,8 +3457,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, /* Fill the ddraw caps structure */ pCaps->DirectDrawCaps.Caps = WINEDDCAPS_GDI | WINEDDCAPS_PALETTE | - blit_caps | - WINEDDCAPS_3D; /* TODO: Make conditional */ + blit_caps; pCaps->DirectDrawCaps.Caps2 = WINEDDCAPS2_CERTIFIED | WINEDDCAPS2_NOPAGELOCKREQUIRED | WINEDDCAPS2_PRIMARYGAMMA | @@ -3483,12 +3482,18 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINEDDSCAPS_PRIMARYSURFACE | WINEDDSCAPS_SYSTEMMEMORY | WINEDDSCAPS_VIDEOMEMORY | - WINEDDSCAPS_VISIBLE | - WINEDDSCAPS_3DDEVICE | /* TODO: Make conditional */ - WINEDDSCAPS_MIPMAP | /* TODO: Make conditional */ - WINEDDSCAPS_TEXTURE | /* TODO: Make conditional */ - WINEDDSCAPS_ZBUFFER; /* TODO: Make conditional */ + WINEDDSCAPS_VISIBLE; pCaps->DirectDrawCaps.StrideAlign = 0; /* TODO: SURFACE_ALIGNMENT */ + + /* Set D3D caps if OpenGL is available. */ + if(Adapters[Adapter].opengl) { + pCaps->DirectDrawCaps.ddsCaps |=WINEDDSCAPS_3DDEVICE | + WINEDDSCAPS_MIPMAP | + WINEDDSCAPS_TEXTURE | + WINEDDSCAPS_ZBUFFER; + pCaps->DirectDrawCaps.Caps |= WINEDDCAPS_3D; + } + return WINED3D_OK; }

1 0

Stefan Dösinger : ddraw: Set ddraw caps in wined3d.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: a47e7badb9484b123be413cdd353ced601b10d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a47e7badb9484b123be413cdd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 29 11:03:59 2008 -0500 ddraw: Set ddraw caps in wined3d. Currently the ddraw capabilities were almost static, except of D3D support. When overlay support is added, the caps depend on certain settings in WineD3D or capabilities available from OpenGL and Xv. So set those caps in wined3d as well. --- dlls/ddraw/ddraw.c | 54 ++++++++++++++++- dlls/ddraw/ddraw_private.h | 2 - dlls/ddraw/main.c | 53 ---------------- dlls/wined3d/directx.c | 63 ++++++++++++++++++- include/wine/wined3d_caps.h | 140 ++++++++++++++++++++++++++++++++++++++++++ include/wine/wined3d_types.h | 22 +++++++ 6 files changed, 276 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a47e7badb9484b123be41…

1 0

Stefan Dösinger : wined3d: Beware of the frontbuffer coordinate system difference.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 474e7ed98c23348ac227c0f611e0bf25d7fe8345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474e7ed98c23348ac227c0f61… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 3 11:33:07 2008 -0500 wined3d: Beware of the frontbuffer coordinate system difference. --- dlls/wined3d/device.c | 42 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/surface.c | 36 +++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12ec046..ffe1cf3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6606,6 +6606,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ IWineD3DSwapChain *src_swapchain, *dst_swapchain; GLenum gl_filter; + POINT offset = {0, 0}; TRACE("(%p) : src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %s (0x%08x), flip %u\n", This, src_surface, src_rect, dst_surface, dst_rect, debug_d3dtexturefiltertype(filter), filter, flip); @@ -6628,7 +6629,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED /* Attach src surface to src fbo */ src_swapchain = get_swapchain(src_surface); if (src_swapchain) { - GLenum buffer; + GLenum buffer = surface_get_gl_buffer(src_surface, src_swapchain); TRACE("Source surface %p is onscreen\n", src_surface); ActivateContext(This, src_surface, CTXUSAGE_RESOURCELOAD); @@ -6636,14 +6637,24 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED * attach_surface_fbo() implicitly takes care of this. */ IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); + if(buffer == GL_FRONT) { + RECT windowsize; + UINT h; + ClientToScreen(This->ddraw_window, &offset); + GetClientRect(This->ddraw_window, &windowsize); + h = windowsize.bottom - windowsize.top; + src_rect->x1 -= offset.x; src_rect->x2 -=offset.x; + src_rect->y1 = offset.y + h - src_rect->y1; + src_rect->y2 = offset.y + h - src_rect->y2; + } else { + src_rect->y1 = ((IWineD3DSurfaceImpl *)src_surface)->currentDesc.Height - src_rect->y1; + src_rect->y2 = ((IWineD3DSurfaceImpl *)src_surface)->currentDesc.Height - src_rect->y2; + } + ENTER_GL(); GL_EXTCALL(glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0)); - buffer = surface_get_gl_buffer(src_surface, src_swapchain); glReadBuffer(buffer); checkGLcall("glReadBuffer()"); - - src_rect->y1 = ((IWineD3DSurfaceImpl *)src_surface)->currentDesc.Height - src_rect->y1; - src_rect->y2 = ((IWineD3DSurfaceImpl *)src_surface)->currentDesc.Height - src_rect->y2; } else { TRACE("Source surface %p is offscreen\n", src_surface); ENTER_GL(); @@ -6659,7 +6670,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED /* Attach dst surface to dst fbo */ dst_swapchain = get_swapchain(dst_surface); if (dst_swapchain) { - GLenum buffer; + GLenum buffer = surface_get_gl_buffer(dst_surface, dst_swapchain); TRACE("Destination surface %p is onscreen\n", dst_surface); ActivateContext(This, dst_surface, CTXUSAGE_RESOURCELOAD); @@ -6667,14 +6678,25 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED * attach_surface_fbo() implicitly takes care of this. */ IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); + if(buffer == GL_FRONT) { + RECT windowsize; + UINT h; + ClientToScreen(This->ddraw_window, &offset); + GetClientRect(This->ddraw_window, &windowsize); + h = windowsize.bottom - windowsize.top; + dst_rect->x1 -= offset.x; dst_rect->x2 -=offset.x; + dst_rect->y1 = offset.y + h - dst_rect->y1; + dst_rect->y2 = offset.y + h - dst_rect->y2; + } else { + /* Screen coords = window coords, surface height = window height */ + dst_rect->y1 = ((IWineD3DSurfaceImpl *)dst_surface)->currentDesc.Height - dst_rect->y1; + dst_rect->y2 = ((IWineD3DSurfaceImpl *)dst_surface)->currentDesc.Height - dst_rect->y2; + } + ENTER_GL(); GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); - buffer = surface_get_gl_buffer(dst_surface, dst_swapchain); glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); - - dst_rect->y1 = ((IWineD3DSurfaceImpl *)dst_surface)->currentDesc.Height - dst_rect->y1; - dst_rect->y2 = ((IWineD3DSurfaceImpl *)dst_surface)->currentDesc.Height - dst_rect->y2; } else { TRACE("Destination surface %p is offscreen\n", dst_surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2227243..cb4d879 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3268,6 +3268,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * WINEDDCOLORKEY oldBltCKey = Src->SrcBltCKey; RECT SourceRectangle; BOOL paletteOverride = FALSE; + GLenum buffer; TRACE("Blt from surface %p to rendertarget %p\n", Src, This); @@ -3340,22 +3341,39 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Activate the destination context, set it up for blitting */ ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); - ENTER_GL(); - - glEnable(Src->glDescription.target); - checkGLcall("glEnable(Src->glDescription.target)"); if(!dstSwapchain) { TRACE("Drawing to offscreen buffer\n"); - glDrawBuffer(myDevice->offscreenBuffer); - checkGLcall("glDrawBuffer"); + buffer = myDevice->offscreenBuffer; } else { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)dstSwapchain); + buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)dstSwapchain); + + /* Front buffer coordinates are screen coordinates, while OpenGL coordinates are + * window relative. Also beware of the origin difference(top left vs bottom left). + * Also beware that the front buffer's surface size is screen width x screen height, + * whereas the real gl drawable size is the size of the window. + */ + if(buffer == GL_FRONT) { + RECT windowsize; + POINT offset = {0,0}; + UINT h; + ClientToScreen(myDevice->ddraw_window, &offset); + GetClientRect(myDevice->ddraw_window, &windowsize); + h = windowsize.bottom - windowsize.top; + rect.x1 -= offset.x; rect.x2 -=offset.x; + rect.y1 -= offset.y; rect.y2 -=offset.y; + rect.y1 += This->currentDesc.Height - h; rect.y2 += This->currentDesc.Height - h; + } TRACE("Drawing to %#x buffer\n", buffer); - glDrawBuffer(buffer); - checkGLcall("glDrawBuffer"); } + ENTER_GL(); + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer"); + + glEnable(Src->glDescription.target); + checkGLcall("glEnable(Src->glDescription.target)"); + /* Bind the texture */ glBindTexture(Src->glDescription.target, Src->glDescription.textureName); checkGLcall("glBindTexture");

1 0