| Index: common/version.h.in |
| — | — | @@ -12,8 +12,8 @@ |
| 13 | 13 | #define DXGLVERQWORD (((unsigned __int64)DXGLMAJOR<<48)+((unsigned __int64)DXGLMINOR<<32)+((unsigned __int64)DXGLPOINT<<16)+(unsigned __int64)DXGLBUILD)
|
| 14 | 14 | #define DXGLVERSTRING $VERSTRING
|
| 15 | 15 |
|
| 16 | | -#define COPYYEAR 2018
|
| 17 | | -#define COPYYEARSTRING "2018"
|
| | 16 | +#define COPYYEAR 2019
|
| | 17 | +#define COPYYEARSTRING "2019"
|
| 18 | 18 |
|
| 19 | 19 | #define SHADER2DVERSION 1
|
| 20 | 20 | #define SHADER3DVERSION 1
|
| Index: ddraw/colorconv.c |
| — | — | @@ -38,6 +38,8 @@ |
| 39 | 39 | pal8topal1, // 14
|
| 40 | 40 | pal8topal2, // 15
|
| 41 | 41 | pal8topal4, // 16
|
| | 42 | + bpp24tobpp32, // 17
|
| | 43 | + bpp32tobpp24, // 18
|
| 42 | 44 | };
|
| 43 | 45 |
|
| 44 | 46 | __inline unsigned int _1to8(unsigned int input)
|
| — | — | @@ -290,4 +292,26 @@ |
| 291 | 293 | void rgbx8888touyvy(size_t count, DWORD *dest, DWORD *src)
|
| 292 | 294 | {
|
| 293 | 295 |
|
| 294 | | -} |
| \ No newline at end of file |
| | 296 | +}
|
| | 297 | +
|
| | 298 | +void bpp24tobpp32(size_t count, DWORD *dest, BYTE *src)
|
| | 299 | +{
|
| | 300 | + size_t i;
|
| | 301 | + for (i = 0; i < count; i++)
|
| | 302 | + {
|
| | 303 | + dest[i] = (src[i * 3] | (src[(i * 3) + 1] << 8) | (src[(i * 3) + 2] << 16));
|
| | 304 | + }
|
| | 305 | +}
|
| | 306 | +
|
| | 307 | +void bpp32tobpp24(size_t count, BYTE *dest, DWORD *src)
|
| | 308 | +{
|
| | 309 | + size_t i;
|
| | 310 | + DWORD in;
|
| | 311 | + for (i = 0; i < count; i++)
|
| | 312 | + {
|
| | 313 | + in = src[i];
|
| | 314 | + dest[i * 3] = in & 0xFF;
|
| | 315 | + dest[(i * 3) + 1] = (in >> 8) & 0xFF;
|
| | 316 | + dest[(i * 3) + 2] = (in >> 16) & 0xFF;
|
| | 317 | + }
|
| | 318 | +}
|
| Index: ddraw/colorconv.h |
| — | — | @@ -43,6 +43,8 @@ |
| 44 | 44 | void rgba8888torgba4444(size_t count, WORD *dest, DWORD *src);
|
| 45 | 45 | void uyvytorgbx8888(size_t count, DWORD *dest, DWORD *src);
|
| 46 | 46 | void rgbx8888touyvy(size_t count, DWORD *dest, DWORD *src);
|
| | 47 | +void bpp24tobpp32(size_t count, DWORD *dest, BYTE *src);
|
| | 48 | +void bpp32tobpp24(size_t count, BYTE *dest, DWORD *src);
|
| 47 | 49 |
|
| 48 | 50 | #ifdef __cplusplus
|
| 49 | 51 | }
|
| Index: ddraw/glTexture.cpp |
| — | — | @@ -1136,9 +1136,13 @@ |
| 1137 | 1137 | This->colorbits[3] = 0;
|
| 1138 | 1138 | break;
|
| 1139 | 1139 | case 19: // 24-bit Z buffer
|
| | 1140 | + This->useconv = TRUE;
|
| | 1141 | + This->convfunctionupload = 17;
|
| | 1142 | + This->convfunctiondownload = 18;
|
| | 1143 | + This->internalsize = 4;
|
| 1140 | 1144 | This->internalformats[0] = GL_DEPTH_COMPONENT24;
|
| 1141 | 1145 | This->format = GL_DEPTH_COMPONENT;
|
| 1142 | | - This->type = GL_UNSIGNED_SHORT;
|
| | 1146 | + This->type = GL_UNSIGNED_INT;
|
| 1143 | 1147 | This->colororder = 4;
|
| 1144 | 1148 | This->colorsizes[0] = 16777215;
|
| 1145 | 1149 | This->colorsizes[1] = 16777215;
|
| Index: dxglcfg/dxglcfg.cpp |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | // DXGL
|
| 3 | | -// Copyright (C) 2011-2018 William Feely
|
| | 3 | +// Copyright (C) 2011-2019 William Feely
|
| 4 | 4 | // Portions copyright (C) 2018 Syahmi Azhar
|
| 5 | 5 |
|
| 6 | 6 | // This library is free software; you can redistribute it and/or
|
| — | — | @@ -3136,7 +3136,7 @@ |
| 3137 | 3137 | HWND hProgressWnd;
|
| 3138 | 3138 | WNDCLASSEX wndclass;
|
| 3139 | 3139 | HWND hTempWnd;
|
| 3140 | | - DWORD threadid;
|
| | 3140 | + //DWORD threadid;
|
| 3141 | 3141 | switch (Msg)
|
| 3142 | 3142 | {
|
| 3143 | 3143 | case WM_INITDIALOG:
|