- fix small TRACE bug introduced in a previous patch

- add WRAPU / WRAPV warning
This commit is contained in:
Lionel Ulmer 2002-12-23 02:09:20 +00:00 committed by Alexandre Julliard
parent 69e711ef01
commit 19ef31e802
2 changed files with 12 additions and 1 deletions

View File

@ -991,9 +991,10 @@ Main_DirectDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect,
TRACE(" - locking flags : "); DDRAW_dump_lockflag(flags); TRACE(" - locking flags : "); DDRAW_dump_lockflag(flags);
} }
if (WARN_ON(ddraw)) { if (WARN_ON(ddraw)) {
if (flags & ~(DDLOCK_WAIT|DDLOCK_READONLY|DDLOCK_WRITEONLY)) if (flags & ~(DDLOCK_WAIT|DDLOCK_READONLY|DDLOCK_WRITEONLY)) {
WARN(" - unsupported locking flag : "); DDRAW_dump_lockflag(flags & ~(DDLOCK_WAIT|DDLOCK_READONLY|DDLOCK_WRITEONLY)); WARN(" - unsupported locking flag : "); DDRAW_dump_lockflag(flags & ~(DDLOCK_WAIT|DDLOCK_READONLY|DDLOCK_WRITEONLY));
} }
}
/* First, copy the Surface description */ /* First, copy the Surface description */
DD_STRUCT_COPY_BYSIZE(pDDSD,&(This->surface_desc)); DD_STRUCT_COPY_BYSIZE(pDDSD,&(This->surface_desc));

View File

@ -109,6 +109,16 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
break; break;
case D3DRENDERSTATE_WRAPU: /* 5 */
if (dwRenderState)
ERR("WRAPU mode unsupported by OpenGL.. Expect graphical glitches !\n");
break;
case D3DRENDERSTATE_WRAPV: /* 6 */
if (dwRenderState)
ERR("WRAPV mode unsupported by OpenGL.. Expect graphical glitches !\n");
break;
case D3DRENDERSTATE_ZENABLE: /* 7 */ case D3DRENDERSTATE_ZENABLE: /* 7 */
if (dwRenderState) if (dwRenderState)
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);