Commit ebfc431b authored by Sam Lantinga's avatar Sam Lantinga

Added temporarily disabled code for hardware acceleration in windowed mode.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40444
parent da6273a8
...@@ -1368,7 +1368,15 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current, ...@@ -1368,7 +1368,15 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
} }
} }
dd_surface3 = NULL; dd_surface3 = NULL;
#if 0 /* FIXME: enable this when SDL consistently reports lost surfaces */
if ( (flags & SDL_HWSURFACE) == SDL_HWSURFACE ) {
video->flags |= SDL_HWSURFACE;
} else {
video->flags |= SDL_SWSURFACE;
}
#else
video->flags |= SDL_SWSURFACE; video->flags |= SDL_SWSURFACE;
#endif
if ( (flags & SDL_RESIZABLE) && !(flags & SDL_NOFRAME) ) { if ( (flags & SDL_RESIZABLE) && !(flags & SDL_NOFRAME) ) {
video->flags |= SDL_RESIZABLE; video->flags |= SDL_RESIZABLE;
} }
...@@ -1587,7 +1595,7 @@ static int DX5_AllocDDSurface(_THIS, SDL_Surface *surface, ...@@ -1587,7 +1595,7 @@ static int DX5_AllocDDSurface(_THIS, SDL_Surface *surface,
memset(&ddsd, 0, sizeof(ddsd)); memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd); ddsd.dwSize = sizeof(ddsd);
result = IDirectDrawSurface3_Lock(dd_surface3, NULL, result = IDirectDrawSurface3_Lock(dd_surface3, NULL,
&ddsd, DDLOCK_NOSYSLOCK, NULL); &ddsd, (DDLOCK_NOSYSLOCK|DDLOCK_WAIT), NULL);
if ( result != DD_OK ) { if ( result != DD_OK ) {
SetDDerror("DirectDrawSurface3::Lock", result); SetDDerror("DirectDrawSurface3::Lock", result);
goto error_end; goto error_end;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment