From b110a96226392fccb7a12bd2d63a9f340fe471b9 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Fri, 3 Jan 2003 21:10:11 +0000 Subject: [PATCH] Reenable device's default render states initialization. --- dlls/ddraw/d3ddevice/main.c | 6 +++--- dlls/ddraw/d3ddevice/mesa.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c index b52b82407b7..ca792fe5b50 100644 --- a/dlls/ddraw/d3ddevice/main.c +++ b/dlls/ddraw/d3ddevice/main.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); DWORD InitRenderStateTab[] = { - /*D3DRENDERSTATE_TEXTUREHANDLE, (DWORD)NULL,*/ + D3DRENDERSTATE_TEXTUREHANDLE, (DWORD)NULL, D3DRENDERSTATE_ANTIALIAS, D3DANTIALIAS_NONE, /* FIXME: D3DRENDERSTATE_TEXTUREADDRESS */ D3DRENDERSTATE_TEXTUREPERSPECTIVE, TRUE, @@ -73,7 +73,7 @@ DWORD InitRenderStateTab[] = { /* FIXME: D3DRENDERSTATE_FOGTABLESTART (same as D3DRENDERSTATE_FOGSTART) */ /* FIXME: D3DRENDERSTATE_FOGTABLEEND (same as D3DRENDERSTATE_FOGEND) */ D3DRENDERSTATE_FOGTABLEDENSITY, 0x3F80000, /* 1.0f (same as D3DRENDERSTATE_FOGDENSITY) */ - /* FXIME: D3DRENDERSTATE_STIPPLEENABLE */ + /* FIXME: D3DRENDERSTATE_STIPPLEENABLE */ D3DRENDERSTATE_EDGEANTIALIAS, FALSE, D3DRENDERSTATE_COLORKEYENABLE, FALSE, /* FIXME: D3DRENDERSTATE_BORDERCOLOR */ @@ -104,7 +104,7 @@ DWORD InitRenderStateTab[] = { D3DRENDERSTATE_WRAP6, 0, D3DRENDERSTATE_WRAP7, 0, D3DRENDERSTATE_CLIPPING, FALSE, - D3DRENDERSTATE_LIGHTING, TRUE, + D3DRENDERSTATE_LIGHTING, FALSE, /* FIXME: Should be TRUE */ D3DRENDERSTATE_EXTENTS, FALSE, D3DRENDERSTATE_AMBIENT, D3DRGBA(0,0,0,0), D3DRENDERSTATE_FOGVERTEXMODE, D3DFOG_NONE, diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c index 67ee1162909..3c78ffeacaa 100644 --- a/dlls/ddraw/d3ddevice/mesa.c +++ b/dlls/ddraw/d3ddevice/mesa.c @@ -2133,9 +2133,7 @@ d3ddevice_create(IDirect3DDeviceImpl **obj, IDirect3DImpl *d3d, IDirectDrawSurfa TRACE(" current context set\n"); /* Apply default render state values */ - /* FIXME: disable because our current D3D code does not like it */ - /* apply_render_state(gl_object, &object->state_block); */ - + apply_render_state(gl_object, &object->state_block); /* FIXME: do something similar for ligh_state and texture_stage_state */ glClearColor(0.0, 0.0, 0.0, 0.0); -- 2.11.4.GIT