Skip to content

Commit

Permalink
Fix regression in Blt filtering.
Browse files Browse the repository at this point in the history
Update release version.
Add more documentation regarding first pass scaling.

git-svn-id: https://www.williamfeely.info/svn/dxgl@716 8a90861a-4eca-46d5-b744-240ff16d0c4d
  • Loading branch information
dxgldotorg committed Jun 12, 2017
1 parent 03b4745 commit ccde321
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Help/configuration.htm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ <h3>Bilinear</h3>
Uses bilinear scaling. 8-bit display modes will always use nearest scaling for this pass.
<h2><a name="scalerfirstsize" />1st pass scale size</h2>
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.
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.
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 />
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."
<h2><a name="scalerfinal" />Scaling method (final pass)</h2>
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,
as well as for blitting operations. The following methods are available:
Expand Down
2 changes: 1 addition & 1 deletion ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DXGL 0.5.10
# DXGL 0.5.11
https://www.dxgl.info

## Introduction
Expand Down
2 changes: 1 addition & 1 deletion common/releasever.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#define DXGLMAJORVER 0
#define DXGLMINORVER 5
#define DXGLPOINTVER 10
#define DXGLPOINTVER 11

#define STR2(x) #x
#define STR(x) STR2(x)
Expand Down
6 changes: 3 additions & 3 deletions ddraw/glRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3165,9 +3165,9 @@ void glRenderer__Blt(glRenderer *This, BltCommand *cmd)
glUtil_SetTexture(This->util, 8, cmd->src);
if(This->ext->GLEXT_ARB_sampler_objects)
{
if((dxglcfg.scalingfilter == 0) || (This->ddInterface->GetBPP() == 8))\
glTexture__SetFilter(cmd->src, 0, GL_NEAREST, GL_NEAREST, This);
else glTexture__SetFilter(cmd->src, 0, GL_LINEAR, GL_LINEAR, This);
if((dxglcfg.scalingfilter == 0) || (This->ddInterface->GetBPP() == 8))
glTexture__SetFilter(cmd->src, 8, GL_NEAREST, GL_NEAREST, This);
else glTexture__SetFilter(cmd->src, 8, GL_LINEAR, GL_LINEAR, This);
}
}
else glUtil_SetTexture(This->util,8,NULL);
Expand Down

0 comments on commit ccde321

Please sign in to comment.