Skip to content

Commit

Permalink
Disable incomplete overlay support.
Browse files Browse the repository at this point in the history
Update readme to describe VS2005/2008 builds and debug trace mode.
Remove beta tag from releasever.h for release.

git-svn-id: https://www.williamfeely.info/svn/dxgl@950 8a90861a-4eca-46d5-b744-240ff16d0c4d
  • Loading branch information
dxgldotorg committed Sep 20, 2019
1 parent 2ea21f2 commit 9c459fe
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 10 deletions.
25 changes: 22 additions & 3 deletions ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
<!--Please enable Word Wrap in Notepad to view this document.-->
# DXGL 0.5.17
https://dxgl.org

## Introduction
DXGL is a free replacement for the Windows ddraw.dll library, running on OpenGL. It is designed to overcome driver bugs, particularly in Windows Vista and newer operating systems. It also adds various enhancements to the graphics output such as display scaling and filtering options. DXGL supports the DirectX 7.0 graphics APIs, however it is currently under development and many programs are not yet compatible with DXGL.

## Updgrade notes
If you upgrade from DXGL 0.5.8 or earlier, the configuration format will be changed, and earlier versions of DXGL will no longer recognize the profiles.
In addition, any profiles generated by older versions of DXGL going forward will not be recognized by DXGL 0.5.9 or later.
If you wish to migrate any old profiles generated after installing DXGL 0.5.9 or later, you will need to use Regedit to delete the "Configuration Version" registry value from the HKEY_CURRENT_USER\SOFTWARE\DXGL registry key to force the upgrade to be run again.
### DXGL 0.5.8
If you upgrade from DXGL 0.5.8 or earlier, the configuration format will be changed, and earlier versions of DXGL will no longer recognize the profiles. In addition, any profiles generated by older versions of DXGL going forward will not be recognized by DXGL 0.5.9 or later. If you wish to migrate any old profiles generated after installing DXGL 0.5.9 or later, you will need to use Regedit to delete the “Configuration Version” registry value from the HKEY_CURRENT_USER\SOFTWARE\DXGL registry key to force the upgrade to be run again. In order to re-run the upgrade, re-run the DXGL installer.

### DXGL 0.5.13
DXGL 0.5.13 fixes up the default value for the “Add color depths” option, because version 0.5.12 and earlier had a default not compatible with current versions. This one-time conversion resets the value for AddColorDepths in the registry entries to 1+4+16 which corresponds to enabling color depths 8-bit, 16-bit, and 32-bit, in order to ensure compatibility with Windows 8 and above.

The “Configuration Version” registry value in HKEY_CURRENT_USER\SOFTWARE\DXGL will be incremented to 2 in order to indicate this fix has been applied.

### DXGL 0.5.17
Due to a bug found in the method used to uniquely identify profile paths, DXGL 0.5.17 and above will perform a one-time renaming of the profile registry keys. These new profiles will no longer be compatible with DXGL 0.5.16 or below.

The “Configuration Version” registry value in HKEY_CURRENT_USER\SOFTWARE\DXGL will be incremented to 3 in order to indicate this fix has been applied. If you need to migrate more version 2 profiles, change “Configuration Version” to 2 and re-run the installer.

## GitHub Notice
If you downloaded the DXGL source code from GitHub, please note that when compiling DXGL, the version number will not indicate the revision number. This issue is also present when compiling from a zipped source code distribution from the dxgl.org, www.dxgl.info, or www.williamfeely.info website.
Expand All @@ -33,6 +43,7 @@ If you downloaded the DXGL source code from GitHub, please note that when compil
* TortoiseSVN (to fill in revision on SVN builds)
* HTML Help Workshop (to build help)
* NSIS (to build installer, requires TortoiseSVN and HTML Help Workshop to succeed)
* In addition Visual C++ 2005 and Visual C++ 2008 project files are available in the vs8 and vs9 directories respectively.

## Build Instructions
These instructions assume that you do not have any of the required software installed. If you already have any or all of this software installed and set up, skip those steps.
Expand All @@ -43,6 +54,14 @@ These instructions assume that you do not have any of the required software inst
* Install NSIS from https://nsis.sourceforge.io/Main_Page
* Open the dxgl.sln file, select your build configuration (Debug or Release) in the toolbar, and press F7 to build.

## Debug tracing
The Debug Trace build has been removed from the project files for DXGL. Instead, DXGL now supports debug tracing files in all builds. To enable tracing in DXGL create a file named dxgl.cfg or dxgl.ini in you game folder and add the following to it:
```
[debug]
DebugTraceLevel=3
```
This can be added to the [debug] section of any existing configuration file. Change back to 0 to disable tracing.

## Progress
For detailed progress information, please check https://www.williamfeely.info/wiki/DXGL_Features
What works:
Expand Down
4 changes: 2 additions & 2 deletions common/releasever.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define DXGLMAJORVER 0
#define DXGLMINORVER 5
#define DXGLPOINTVER 17
#define DXGLBETA 1
#define DXGLBETA 0

#define STR2(x) #x
#define STR(x) STR2(x)
Expand All @@ -17,6 +17,6 @@
1 - sign non-beta only
2 - sign release only
3 - sign all */
#define SIGNMODE 1
#define SIGNMODE 0

#endif //__VERSION_H
10 changes: 5 additions & 5 deletions ddraw/glDirectDraw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1471,8 +1471,8 @@ HRESULT WINAPI glDirectDraw7::GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELC
if (ddCaps.dwSize < sizeof(DDCAPS_DX3)) TRACE_RET(HRESULT, 23, DDERR_INVALIDPARAMS);
ddCaps.dwCaps = DDCAPS_BLT | DDCAPS_BLTCOLORFILL | DDCAPS_BLTDEPTHFILL | DDCAPS_BLTFOURCC |
DDCAPS_BLTSTRETCH | DDCAPS_COLORKEY | DDCAPS_GDI | DDCAPS_PALETTE | DDCAPS_CANBLTSYSMEM |
DDCAPS_3D | DDCAPS_CANCLIP | DDCAPS_CANCLIPSTRETCHED | DDCAPS_READSCANLINE |
DDCAPS_OVERLAY | DDCAPS_OVERLAYSTRETCH;
DDCAPS_3D | DDCAPS_CANCLIP | DDCAPS_CANCLIPSTRETCHED | DDCAPS_READSCANLINE;// |
//DDCAPS_OVERLAY | DDCAPS_OVERLAYSTRETCH;
ddCaps.dwCaps2 = DDCAPS2_CANRENDERWINDOWED | DDCAPS2_WIDESURFACES | DDCAPS2_NOPAGELOCKREQUIRED |
DDCAPS2_FLIPINTERVAL | DDCAPS2_FLIPNOVSYNC | DDCAPS2_NONLOCALVIDMEM;
ddCaps.dwFXCaps = DDFXCAPS_BLTSHRINKX | DDFXCAPS_BLTSHRINKY |
Expand All @@ -1485,10 +1485,10 @@ HRESULT WINAPI glDirectDraw7::GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELC
DDSCAPS_FRONTBUFFER | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_PALETTE |
DDSCAPS_SYSTEMMEMORY | DDSCAPS_VIDEOMEMORY | DDSCAPS_3DDEVICE |
DDSCAPS_NONLOCALVIDMEM | DDSCAPS_LOCALVIDMEM | DDSCAPS_TEXTURE |
DDSCAPS_MIPMAP | DDSCAPS_OVERLAY;
DDSCAPS_MIPMAP;// | DDSCAPS_OVERLAY;
ddCaps.ddsCaps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL;
ddCaps.dwMinOverlayStretch = 1;
ddCaps.dwMaxOverlayStretch = 2147483647;
//ddCaps.dwMinOverlayStretch = 1;
//ddCaps.dwMaxOverlayStretch = 2147483647;
ddCaps.dwCKeyCaps = DDCKEYCAPS_SRCBLT | DDCKEYCAPS_DESTBLT;
ddCaps.dwZBufferBitDepths = DDBD_16 | DDBD_24 | DDBD_32;
ddCaps.dwNumFourCCCodes = GetNumFOURCC();
Expand Down

0 comments on commit 9c459fe

Please sign in to comment.