DXGL r336 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:r335‎ | r336 | r337 >
Date:02:12, 25 February 2013
Author:admin
Status:new
Tags:
Comment:
Set DDSCAPS_VIDEOMEMORY on new surfaces that are not marked DDSCAPS_SYSTEMMEMORY.
Remove breakpoint for RGB332 surfaces/textures, as their color ordering has been verified correct.
Modified paths:
  • /ddraw/glDirectDrawSurface.cpp (modified) (history)
  • /ddraw/texture.cpp (modified) (history)

Diff [purge]

Index: ddraw/glDirectDrawSurface.cpp
@@ -77,6 +77,7 @@
7878 hRC = renderer->hRC;
7979 ddsd = *lpDDSurfaceDesc2;
8080 }
 81+ if(!(ddsd.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) ddsd.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY;
8182 LONG sizes[6];
8283 ddInterface->GetSizes(sizes);
8384 if(ddsd.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
Index: ddraw/texture.cpp
@@ -82,7 +82,6 @@
8383 texture->internalformat = GL_R3_G3_B2;
8484 texture->format = GL_RGB;
8585 texture->type = GL_UNSIGNED_BYTE_3_3_2;
86 - FIXME("Untested texture format RGB332\n");
8786 break;
8887 case 2: // 16-bit RGB555
8988 texture->internalformat = GL_RGB5_A1;