DXGL r716 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r715‎ | r716 | r717 >
Date:01:29, 12 June 2017
Author:admin
Status:new
Tags:
Comment:
Fix regression in Blt filtering.
Update release version.
Add more documentation regarding first pass scaling.
Modified paths:
  • /Help/configuration.htm (modified) (history)
  • /ReadMe.md (modified) (history)
  • /common/releasever.h (modified) (history)
  • /ddraw/glRenderer.cpp (modified) (history)

Diff [purge]

Index: Help/configuration.htm
——@@ -79,7 +79,8 @@
8080 Uses bilinear scaling. 8-bit display modes will always use nearest scaling for this pass.
8181 <h2><a name="scalerfirstsize" />1st pass scale size</h2>
8282 Selects the amount to scale the display on the first pass. There is an Auto preset as well as presets for fixed 1x, 2x1, 2x, 3x, and 4x ratios. In addition, a ratio can manually be set anywhere from 0.25x0.25 to 16x16. The Auto preset will automatically double pixels horizontally if the horizontal resolution is 400 pixels or less, and will double pixels vertically if the vertical resolution is 300 or less.
83 - In addition, if Video mode is set to Change desktop resolution and Add extra display modes is enabled, a subset of low resolution pixel doubled modes will be added.
 83+ In addition, if Video mode is set to Change desktop resolution and Add extra display modes is enabled, a subset of low resolution pixel doubled modes will be added.<br />
 84+ If "Adjust primary resolution" is checked, typing 0.5 in the box will enable 2x2 supersampling for Direct3D applications. This will also modify the behavior of "Change desktop resolution."
8485 <h2><a name="scalerfinal" />Scaling method (final pass)</h2>
8586 Selects the filter to use for scaling the output when the resolution is different than the desktop resolution, or when the optional 1st pass scaling is in effect, the scaled resolution is different from the desktop resolution,
8687 as well as for blitting operations. The following methods are available:
Index: ReadMe.md
——@@ -1,4 +1,4 @@
2 -# DXGL 0.5.10
 2+# DXGL 0.5.11
33 https://www.dxgl.info
44
55 ## Introduction
Index: common/releasever.h
——@@ -4,7 +4,7 @@
55
66 #define DXGLMAJORVER 0
77 #define DXGLMINORVER 5
8 -#define DXGLPOINTVER 10
 8+#define DXGLPOINTVER 11
99
1010 #define STR2(x) #x
1111 #define STR(x) STR2(x)
Index: ddraw/glRenderer.cpp
——@@ -3165,9 +3165,9 @@
31663166 glUtil_SetTexture(This->util, 8, cmd->src);
31673167 if(This->ext->GLEXT_ARB_sampler_objects)
31683168 {
3169 - if((dxglcfg.scalingfilter == 0) || (This->ddInterface->GetBPP() == 8))\
3170 - glTexture__SetFilter(cmd->src, 0, GL_NEAREST, GL_NEAREST, This);
3171 - else glTexture__SetFilter(cmd->src, 0, GL_LINEAR, GL_LINEAR, This);
 3169+ if((dxglcfg.scalingfilter == 0) || (This->ddInterface->GetBPP() == 8))
 3170+ glTexture__SetFilter(cmd->src, 8, GL_NEAREST, GL_NEAREST, This);
 3171+ else glTexture__SetFilter(cmd->src, 8, GL_LINEAR, GL_LINEAR, This);
31723172 }
31733173 }
31743174 else glUtil_SetTexture(This->util,8,NULL);
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/716"