On Mon, Jun 13, 2005 at 01:45:02AM +0100, Oliver Stieber wrote:
I do not think this even compiled for you, there are CVS merge conflicts in the patch, see below...
Can you _please_ work in getting patches into WINE? If possible small and self contained.
This would help all of us. :/
Ciao, Marcus
.... @@ -412,17 +571,24 @@ while (pow2Width < Width) pow2Width <<= 1; while (pow2Height < Height) pow2Height <<= 1;
+<<<<<<< device.c + /* TODO: support for non-power 2 textures */ + if((pow2Width > Width || pow2Height > Height) && !Usage & D3DUSAGE_RENDERTARGET){ + /** TODO: add support for non power two compressed textures (OpenGL provices support for * non-power-two textures gratis) **/ + FIXME("Non-power 2 textures are not supported\n"); +======= if(pow2Width > Width || pow2Height > Height){ FIXME("non-power-two textures unsupported\n"); /* OpenGL provides support for these gratis */ +>>>>>>> 1.31 return D3DERR_NOTAVAILABLE; }
......
- HDC hDc; + IWineD3DDevice** ppReturnedDeviceInterface, IUnknown *parent, + D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *object = NULL; IWineD3DImpl *This = (IWineD3DImpl *)iface; +<<<<<<< directx.c + IWineD3DSwapChainImpl *swapchain; +======= int num; XVisualInfo template; HRESULT res; +>>>>>>> 1.31
......
+<<<<<<< directx.c + /* Initialize the current view state */ + object->modelview_valid = 1; + object->proj_valid = 0; + object->view_ident = 1; + object->last_was_rhw = 0; + glGetIntegerv(GL_MAX_LIGHTS, &object->maxConcurrentLights); + TRACE("(%p,%d) All defaults now set up, leaving CreateDevice with %p\n", This, Adapter, object); +======= /* Change the display settings */ memset(&devmode, 0, sizeof(DEVMODEW)); devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; @@ -1709,67 +1743,14 @@ IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) object->stencilBufferTarget); } */ +>>>>>>> 1.31
- /* Set up some starting GL setup */ - ENTER_GL(); + /* Clear the screen */ + IWineD3DDevice_Clear((IWineD3DDevice *) object, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER|D3DCLEAR_TARGET, 0x00, 1.0, 0);