wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Rob Shearman : widl: Include the version number in the __WIDL__ preprocessor definition.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 0a8e3c39a1e05f47136c69671ff691dc02ae0a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8e3c39a1e05f47136c69671… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 26 13:31:25 2009 +0000 widl: Include the version number in the __WIDL__ preprocessor definition. --- tools/widl/widl.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 62b7ff5..cbc35b7 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -196,6 +196,36 @@ static char *dup_basename_token(const char *name, const char *ext) return ret; } +static void add_widl_version_define(void) +{ + unsigned int version; + const char *p = PACKAGE_VERSION; + + /* major */ + version = atoi(p) * 0x10000; + p = strchr(p, '.'); + + /* minor */ + if (p) + { + version += atoi(p + 1) * 0x100; + p = strchr(p + 1, '.'); + } + + /* build */ + if (p) + version += atoi(p + 1); + + if (version != 0) + { + char version_str[11]; + snprintf(version_str, sizeof(version_str), "0x%x", version); + wpp_add_define("__WIDL__", version_str); + } + else + wpp_add_define("__WIDL__", NULL); +} + /* clean things up when aborting on a signal */ static void exit_on_signal( int sig ) { @@ -596,7 +626,7 @@ int main(int argc,char *argv[]) if (do_client) client_token = dup_basename_token(client_name,"_c.c"); if (do_server) server_token = dup_basename_token(server_name,"_s.c"); - wpp_add_cmdline_define("__WIDL__"); + add_widl_version_define(); atexit(rm_tempfile); if (!no_preprocess)

1 0

Henri Verbeet : wined3d: Pass the number of components to glVertexBlendARB( ).
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: c0c1c42288f0a78abf2bd24808411772f25d6580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c1c42288f0a78abf2bd2480… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:41 2009 +0100 wined3d: Pass the number of components to glVertexBlendARB(). --- dlls/wined3d/state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ab18459..b4e5642 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4026,13 +4026,13 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const WineDirect3 (sd->u.s.blendMatrixIndices.lpData) || (sd->u.s.blendMatrixIndices.VBO) ) { if (GL_SUPPORT(ARB_VERTEX_BLEND)) { - TRACE("Blend %d %p %d\n", WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType), + TRACE("Blend %d %p %d\n", WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType), sd->u.s.blendWeights.lpData + stateblock->loadBaseVertexIndex * sd->u.s.blendWeights.dwStride, sd->u.s.blendWeights.dwStride + offset[sd->u.s.blendWeights.streamNo]); glEnableClientState(GL_WEIGHT_ARRAY_ARB); checkGLcall("glEnableClientState(GL_WEIGHT_ARRAY_ARB)"); - GL_EXTCALL(glVertexBlendARB(WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType) + 1)); + GL_EXTCALL(glVertexBlendARB(WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType) + 1)); VTRACE(("glWeightPointerARB(%d, GL_FLOAT, %d, %p)\n", WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType) ,

1 0

Henri Verbeet : wined3d: Simplify the "transformed" check in state_lighting ().
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 663e5a6a4cd43ec502f4c1122604007e1af1b67a URL: http://source.winehq.org/git/wine.git/?a=commit;h=663e5a6a4cd43ec502f4c1122… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:40 2009 +0100 wined3d: Simplify the "transformed" check in state_lighting(). It doesn't really matter if lighting is enabled or not if we don't have position data. --- dlls/wined3d/state.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6035c71..ab18459 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -81,8 +81,6 @@ static void state_fillmode(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - BOOL transformed; - /* Lighting is not enabled if transformed vertices are drawn * but lighting does not affect the stream sources, so it is not grouped for performance reasons. * This state reads the decoded vertex declaration, so if it is dirty don't do anything. The @@ -93,11 +91,9 @@ static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine return; } - transformed = ((stateblock->wineD3DDevice->strided_streams.u.s.position.lpData != NULL || - stateblock->wineD3DDevice->strided_streams.u.s.position.VBO != 0) && - stateblock->wineD3DDevice->strided_streams.position_transformed) ? TRUE : FALSE; - - if (stateblock->renderState[WINED3DRS_LIGHTING] && !transformed) { + if (stateblock->renderState[WINED3DRS_LIGHTING] + && !stateblock->wineD3DDevice->strided_streams.position_transformed) + { glEnable(GL_LIGHTING); checkGLcall("glEnable GL_LIGHTING"); } else {

1 0

Henri Verbeet : wined3d: Simplify IWineD3DDeviceImpl_ProcessVertices().
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: a7d612854750ec6a7e572d94851c0abc39a7d2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d612854750ec6a7e572d948… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:40 2009 +0100 wined3d: Simplify IWineD3DDeviceImpl_ProcessVertices(). --- dlls/wined3d/device.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 73d1ac8..c0f0d85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4680,30 +4680,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, * * Also get the start index in, but only loop over all elements if there's something to add at all. */ -#define FIXSRC(type) \ - if(strided.u.s.type.VBO) { \ - struct wined3d_buffer *vb = (struct wined3d_buffer *)This->stateBlock->streamSource[strided.u.s.type.streamNo]; \ - strided.u.s.type.VBO = 0; \ - strided.u.s.type.lpData = (BYTE *) ((unsigned long) strided.u.s.type.lpData + (unsigned long) vb->resource.allocatedMemory); \ - ENTER_GL(); \ - GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); \ - vb->buffer_object = 0; \ - LEAVE_GL(); \ - } \ - if(strided.u.s.type.lpData) { \ - strided.u.s.type.lpData += strided.u.s.type.dwStride * SrcStartIndex; \ - } - FIXSRC(position); - FIXSRC(blendWeights); - FIXSRC(blendMatrixIndices); - FIXSRC(normal); - FIXSRC(pSize); - FIXSRC(diffuse); - FIXSRC(specular); - for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { - FIXSRC(texCoords[i]); - } -#undef FIXSRC + for (i = 0; i < (sizeof(strided.u.input) / sizeof(*strided.u.input)); ++i) + { + if (strided.u.input[i].VBO) + { + struct wined3d_buffer *vb = + (struct wined3d_buffer *)This->stateBlock->streamSource[strided.u.input[i].streamNo]; + strided.u.input[i].VBO = 0; + strided.u.input[i].lpData = (BYTE *)((unsigned long)strided.u.input[i].lpData + (unsigned long)vb->resource.allocatedMemory); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); + vb->buffer_object = 0; + LEAVE_GL(); + } + if (strided.u.input[i].lpData) + { + strided.u.input[i].lpData += strided.u.input[i].dwStride * SrcStartIndex; + } + } } return process_vertices_strided(This, DestIndex, VertexCount, &strided,

1 0

Henri Verbeet : wined3d: Simplify remove_vbos().
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: c1a42ff0243e70263e5d7f0d8f54e0988cb55a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a42ff0243e70263e5d7f0d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:40 2009 +0100 wined3d: Simplify remove_vbos(). --- dlls/wined3d/drawprim.c | 51 ++++++++-------------------------------------- 1 files changed, 9 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e408696..4718969 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -681,49 +681,16 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const WineDirect3 } static inline void remove_vbos(IWineD3DDeviceImpl *This, WineDirect3DVertexStridedData *s) { - unsigned char i; - struct wined3d_buffer *vb; + unsigned int i; - if(s->u.s.position.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.position.streamNo]; - s->u.s.position.VBO = 0; - s->u.s.position.lpData = (BYTE *) ((unsigned long) s->u.s.position.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.blendWeights.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.blendWeights.streamNo]; - s->u.s.blendWeights.VBO = 0; - s->u.s.blendWeights.lpData = (BYTE *) ((unsigned long) s->u.s.blendWeights.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.blendMatrixIndices.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.blendMatrixIndices.streamNo]; - s->u.s.blendMatrixIndices.VBO = 0; - s->u.s.blendMatrixIndices.lpData = (BYTE *) ((unsigned long) s->u.s.blendMatrixIndices.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.normal.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.normal.streamNo]; - s->u.s.normal.VBO = 0; - s->u.s.normal.lpData = (BYTE *) ((unsigned long) s->u.s.normal.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.pSize.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.pSize.streamNo]; - s->u.s.pSize.VBO = 0; - s->u.s.pSize.lpData = (BYTE *) ((unsigned long) s->u.s.pSize.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.diffuse.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.diffuse.streamNo]; - s->u.s.diffuse.VBO = 0; - s->u.s.diffuse.lpData = (BYTE *) ((unsigned long) s->u.s.diffuse.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.specular.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.specular.streamNo]; - s->u.s.specular.VBO = 0; - s->u.s.specular.lpData = (BYTE *) ((unsigned long) s->u.s.specular.lpData + (unsigned long) vb->resource.allocatedMemory); - } - for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { - if(s->u.s.texCoords[i].VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.texCoords[i].streamNo]; - s->u.s.texCoords[i].VBO = 0; - s->u.s.texCoords[i].lpData = (BYTE *) ((unsigned long) s->u.s.texCoords[i].lpData + (unsigned long) vb->resource.allocatedMemory); + for (i = 0; i < (sizeof(s->u.input) / sizeof(*s->u.input)); ++i) + { + if (s->u.input[i].VBO) + { + struct wined3d_buffer *vb = + (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.input[i].streamNo]; + s->u.input[i].VBO = 0; + s->u.input[i].lpData = (BYTE *)((unsigned long)s->u.input[i].lpData + (unsigned long)vb->resource.allocatedMemory); } } }

1 0

Henri Verbeet : wined3d: Remove unused attributes from WineDirect3DVertexStridedData.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 6afd97cc9f15e211f6cf81d15630ce3b450645cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afd97cc9f15e211f6cf81d15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:39 2009 +0100 wined3d: Remove unused attributes from WineDirect3DVertexStridedData. These are essentially unused, and mostly just complicate the code. --- dlls/wined3d/device.c | 8 ------ dlls/wined3d/drawprim.c | 56 ---------------------------------------------- dlls/wined3d/state.c | 22 ------------------ include/wine/wined3d.idl | 9 ------- 4 files changed, 0 insertions(+), 95 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9c7e6ca..73d1ac8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4703,14 +4703,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { FIXSRC(texCoords[i]); } - FIXSRC(position2); - FIXSRC(normal2); - FIXSRC(tangent); - FIXSRC(binormal); - FIXSRC(tessFactor); - FIXSRC(fog); - FIXSRC(depth); - FIXSRC(sample); #undef FIXSRC } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3f61b8a..e408696 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -57,22 +57,6 @@ static BOOL fixed_get_input( *regnum = 6; else if (usage == WINED3DDECLUSAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) *regnum = 7 + usage_idx; - else if ((usage == WINED3DDECLUSAGE_POSITION || usage == WINED3DDECLUSAGE_POSITIONT) && usage_idx == 1) - *regnum = 7 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_NORMAL && usage_idx == 1) - *regnum = 8 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_TANGENT && usage_idx == 0) - *regnum = 9 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_BINORMAL && usage_idx == 0) - *regnum = 10 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_TESSFACTOR && usage_idx == 0) - *regnum = 11 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_FOG && usage_idx == 0) - *regnum = 12 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_DEPTH && usage_idx == 0) - *regnum = 13 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_SAMPLE && usage_idx == 0) - *regnum = 14 + WINED3DDP_MAXTEXCOORD; if (*regnum == -1) { FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n", @@ -742,46 +726,6 @@ static inline void remove_vbos(IWineD3DDeviceImpl *This, WineDirect3DVertexStrid s->u.s.texCoords[i].lpData = (BYTE *) ((unsigned long) s->u.s.texCoords[i].lpData + (unsigned long) vb->resource.allocatedMemory); } } - if(s->u.s.position2.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.position2.streamNo]; - s->u.s.position2.VBO = 0; - s->u.s.position2.lpData = (BYTE *) ((unsigned long) s->u.s.position2.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.normal2.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.normal2.streamNo]; - s->u.s.normal2.VBO = 0; - s->u.s.normal2.lpData = (BYTE *) ((unsigned long) s->u.s.normal2.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.tangent.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.tangent.streamNo]; - s->u.s.tangent.VBO = 0; - s->u.s.tangent.lpData = (BYTE *) ((unsigned long) s->u.s.tangent.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.binormal.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.binormal.streamNo]; - s->u.s.binormal.VBO = 0; - s->u.s.binormal.lpData = (BYTE *) ((unsigned long) s->u.s.binormal.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.tessFactor.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.tessFactor.streamNo]; - s->u.s.tessFactor.VBO = 0; - s->u.s.tessFactor.lpData = (BYTE *) ((unsigned long) s->u.s.tessFactor.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.fog.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.fog.streamNo]; - s->u.s.fog.VBO = 0; - s->u.s.fog.lpData = (BYTE *) ((unsigned long) s->u.s.fog.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.depth.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.depth.streamNo]; - s->u.s.depth.VBO = 0; - s->u.s.depth.lpData = (BYTE *) ((unsigned long) s->u.s.depth.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.sample.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.sample.streamNo]; - s->u.s.sample.VBO = 0; - s->u.s.sample.lpData = (BYTE *) ((unsigned long) s->u.s.sample.lpData + (unsigned long) vb->resource.allocatedMemory); - } } /* Routine common to the draw primitive and draw indexed primitive routines */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 55f2ff4..6035c71 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4243,14 +4243,6 @@ static inline void drawPrimitiveTraceDataLocations(const WineDirect3DVertexStrid TRACE_STRIDED((dataLocations), texCoords[5]); TRACE_STRIDED((dataLocations), texCoords[6]); TRACE_STRIDED((dataLocations), texCoords[7]); - TRACE_STRIDED((dataLocations), position2); - TRACE_STRIDED((dataLocations), normal2); - TRACE_STRIDED((dataLocations), tangent); - TRACE_STRIDED((dataLocations), binormal); - TRACE_STRIDED((dataLocations), tessFactor); - TRACE_STRIDED((dataLocations), fog); - TRACE_STRIDED((dataLocations), depth); - TRACE_STRIDED((dataLocations), sample); return; } @@ -4333,20 +4325,6 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo loadVertexData(stateblock, dataLocations); context->namedArraysLoaded = TRUE; } - -/* Generate some fixme's if unsupported functionality is being used */ -#define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData - /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */ - if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) { - FIXME("Tweening is only valid with vertex shaders\n"); - } - if (!useVertexShaderFunction && BUFFER_OR_DATA(binormal)) { - FIXME("Binormal bump mapping is only valid with vertex shaders\n"); - } - if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) { - FIXME("Extended attributes are only valid with vertex shaders\n"); - } -#undef BUFFER_OR_DATA } static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 5d502f1..4cf9159 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1945,15 +1945,6 @@ typedef struct WineDirect3DVertexStridedData WineDirect3DStridedData diffuse; WineDirect3DStridedData specular; WineDirect3DStridedData texCoords[WINED3DDP_MAXTEXCOORD]; - WineDirect3DStridedData position2; /* tween data */ - WineDirect3DStridedData normal2; /* tween data */ - WineDirect3DStridedData tangent; - WineDirect3DStridedData binormal; - WineDirect3DStridedData tessFactor; - WineDirect3DStridedData fog; - WineDirect3DStridedData depth; - WineDirect3DStridedData sample; - /* Add fields here */ } s; WineDirect3DStridedData input[16]; /* Indexed by constants in D3DVSDE_REGISTER */

1 0

Henri Verbeet : d3d9: Don't depend on specific display modes in test_reset( ).
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 8a0fc70584e57f8f96eb04cad9810da0b14144f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0fc70584e57f8f96eb04cad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:39 2009 +0100 d3d9: Don't depend on specific display modes in test_reset(). --- dlls/d3d9/tests/device.c | 84 ++++++++++++++++++++++++++++++--------------- 1 files changed, 56 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 055885e..f254719 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -725,9 +725,14 @@ static void test_reset(void) IDirect3DSurface9 *surface; IDirect3DTexture9 *texture; IDirect3DVertexShader9 *shader; - BOOL support_800x600 = FALSE; - UINT i; + UINT i, adapter_mode_count; D3DLOCKED_RECT lockrect; + struct + { + UINT w; + UINT h; + } *modes = NULL; + UINT mode_count = 0; pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); @@ -736,23 +741,27 @@ static void test_reset(void) if (!pD3d || !hwnd) goto cleanup; IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); - ZeroMemory( &d3dpp, sizeof(d3dpp) ); - d3dpp.Windowed = FALSE; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; - d3dpp.BackBufferFormat = d3ddm.Format; - d3dpp.EnableAutoDepthStencil = TRUE; - d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; - - for(i = 0; i < IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); i++) { + adapter_mode_count = IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); + modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*modes) * adapter_mode_count); + for(i = 0; i < adapter_mode_count; ++i) + { + int j; ZeroMemory( &d3ddm2, sizeof(d3ddm2) ); hr = IDirect3D9_EnumAdapterModes(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); ok(hr == D3D_OK, "IDirect3D9_EnumAdapterModes returned %#x\n", hr); - if(d3ddm2.Width == 800 && d3ddm2.Height == 600) { - support_800x600 = TRUE; + for (j = 0; j < mode_count; ++j) + { + if (modes[j].w == d3ddm2.Width && modes[j].h == d3ddm2.Height) + break; + } + if (j == mode_count) + { + modes[j].w = d3ddm2.Width; + modes[j].h = d3ddm2.Height; + ++mode_count; } + /* We use them as invalid modes */ if((d3ddm2.Width == 801 && d3ddm2.Height == 600) || (d3ddm2.Width == 32 && d3ddm2.Height == 32)) { @@ -761,11 +770,25 @@ static void test_reset(void) goto cleanup; } } - if(!support_800x600) { - skip("Mode 800x600 not supported, skipping mode tests\n"); + + if (mode_count < 2) + { + skip("Less than 2 modes supported, skipping mode tests\n"); goto cleanup; } + i = 0; + if (modes[i].w == orig_width && modes[i].h == orig_height) ++i; + + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = FALSE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = modes[i].w; + d3dpp.BackBufferHeight = modes[i].h; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); @@ -779,8 +802,8 @@ static void test_reset(void) width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); - ok(width == 800, "Screen width is %d\n", width); - ok(height == 600, "Screen height is %d\n", height); + ok(width == modes[i].w, "Screen width is %u, expected %u\n", width, modes[i].w); + ok(height == modes[i].h, "Screen height is %u, expected %u\n", height, modes[i].h); hr = IDirect3DDevice9_GetViewport(pDevice, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); @@ -788,11 +811,13 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); - ok(vp.Width == 800, "D3DVIEWPORT->Width = %d\n", vp.Width); - ok(vp.Height == 600, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u\n", vp.Width, modes[i].w); + ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u\n", vp.Height, modes[i].h); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } + + i = 1; vp.X = 10; vp.Y = 20; vp.MinZ = 2; @@ -803,8 +828,8 @@ static void test_reset(void) ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; - d3dpp.BackBufferWidth = 640; - d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferWidth = modes[i].w; + d3dpp.BackBufferHeight = modes[i].h; d3dpp.BackBufferFormat = d3ddm.Format; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); @@ -818,16 +843,16 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); - ok(vp.Width == 640, "D3DVIEWPORT->Width = %d\n", vp.Width); - ok(vp.Height == 480, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u\n", vp.Width, modes[i].w); + ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u\n", vp.Height, modes[i].h); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); - ok(width == 640, "Screen width is %d\n", width); - ok(height == 480, "Screen height is %d\n", height); + ok(width == modes[i].w, "Screen width is %u, expected %u\n", width, modes[i].w); + ok(height == modes[i].h, "Screen height is %u, expected %u\n", height, modes[i].h); hr = IDirect3DDevice9_GetSwapChain(pDevice, 0, &pSwapchain); ok(hr == D3D_OK, "IDirect3DDevice9_GetSwapChain returned %08x\n", hr); @@ -838,8 +863,10 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DSwapChain9_GetPresentParameters returned %08x\n", hr); if(SUCCEEDED(hr)) { - ok(d3dpp.BackBufferWidth == 640, "Back buffer width is %d\n", d3dpp.BackBufferWidth); - ok(d3dpp.BackBufferHeight == 480, "Back buffer height is %d\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == modes[i].w, "Back buffer width is %u, expected %u\n", + d3dpp.BackBufferWidth, modes[i].w); + ok(d3dpp.BackBufferHeight == modes[i].h, "Back buffer height is %u, expected %u\n", + d3dpp.BackBufferHeight, modes[i].h); } IDirect3DSwapChain9_Release(pSwapchain); } @@ -1023,6 +1050,7 @@ static void test_reset(void) ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); cleanup: + HeapFree(GetProcessHeap(), 0, modes); if(pD3d) IDirect3D9_Release(pD3d); if(pDevice) IDirect3D9_Release(pDevice); }

1 0

Henri Verbeet : d3d9: Properly initialize the viewport dimensions.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 49c22d6100f811a2c3505fdd5c859a0f6c23c578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c22d6100f811a2c3505fdd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:39 2009 +0100 d3d9: Properly initialize the viewport dimensions. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 84b68cb..055885e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -794,7 +794,7 @@ static void test_reset(void) ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } vp.X = 10; - vp.X = 20; + vp.Y = 20; vp.MinZ = 2; vp.MaxZ = 3; hr = IDirect3DDevice9_SetViewport(pDevice, &vp);

1 0

Henri Verbeet : d3d9: Fix some indentation.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: db9bd91893a9c9649930054c7a20f29a3ebbcb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9bd91893a9c9649930054c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:38 2009 +0100 d3d9: Fix some indentation. --- dlls/d3d9/tests/device.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a0597f5..84b68cb 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -740,7 +740,7 @@ static void test_reset(void) d3dpp.Windowed = FALSE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; @@ -804,7 +804,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; d3dpp.BackBufferWidth = 640; - d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferHeight = 480; d3dpp.BackBufferFormat = d3ddm.Format; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); @@ -848,7 +848,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE; d3dpp.BackBufferWidth = 400; - d3dpp.BackBufferHeight = 300; + d3dpp.BackBufferHeight = 300; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); @@ -891,7 +891,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE; d3dpp.BackBufferWidth = 400; - d3dpp.BackBufferHeight = 300; + d3dpp.BackBufferHeight = 300; /* _Reset fails if there is a resource in the default pool */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 16, 16, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &surface, NULL); @@ -1006,7 +1006,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; d3dpp.BackBufferWidth = 32; - d3dpp.BackBufferHeight = 32; + d3dpp.BackBufferHeight = 32; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Reset to w=32, h=32, windowed=FALSE failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); @@ -1016,7 +1016,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; d3dpp.BackBufferWidth = 801; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Reset to w=801, h=600, windowed=FALSE failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); @@ -1141,7 +1141,7 @@ static void test_scene(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1294,7 +1294,7 @@ static void test_limits(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1362,7 +1362,7 @@ static void test_depthstenciltest(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1431,7 +1431,7 @@ static void test_depthstenciltest(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = FALSE; d3dpp.AutoDepthStencilFormat = D3DFMT_UNKNOWN; @@ -1465,7 +1465,7 @@ static void test_depthstenciltest(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = FALSE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16;

1 0

Henri Verbeet : d3d8: Fix some indentation.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 41ea1e1df756bcdc14ba961e6013accd3193c2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ea1e1df756bcdc14ba961e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:38 2009 +0100 d3d8: Fix some indentation. --- dlls/d3d8/tests/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 449348f..aa2b627 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -715,7 +715,7 @@ static void test_states(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 640; - d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferHeight = 480; d3dpp.BackBufferFormat = d3ddm.Format; hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, @@ -808,7 +808,7 @@ static void test_scene(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; @@ -914,7 +914,7 @@ static void test_shader(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; @@ -1111,7 +1111,7 @@ static void test_limits(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1174,7 +1174,7 @@ static void test_lights(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1256,7 +1256,7 @@ static void test_render_zero_triangles(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
84
Older →

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