2006-11-19 02:10:25 +00:00
|
|
|
/*
|
|
|
|
** fb_d3d9.cpp
|
|
|
|
** Code to let ZDoom use Direct3D 9 as a simple framebuffer
|
|
|
|
**
|
|
|
|
**---------------------------------------------------------------------------
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
** Copyright 1998-2008 Randy Heit
|
2006-11-19 02:10:25 +00:00
|
|
|
** All rights reserved.
|
|
|
|
**
|
|
|
|
** Redistribution and use in source and binary forms, with or without
|
|
|
|
** modification, are permitted provided that the following conditions
|
|
|
|
** are met:
|
|
|
|
**
|
|
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer.
|
|
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
|
|
** documentation and/or other materials provided with the distribution.
|
|
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
|
|
** derived from this software without specific prior written permission.
|
|
|
|
**
|
|
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
**
|
|
|
|
** This file does _not_ implement hardware-acclerated rendering. It is just
|
|
|
|
** a means of getting the pixel data to the screen in a more reliable
|
|
|
|
** method on modern hardware by copying the entire frame to a texture,
|
|
|
|
** drawing that to the screen, and presenting.
|
|
|
|
*/
|
|
|
|
|
|
|
|
// HEADER FILES ------------------------------------------------------------
|
|
|
|
|
|
|
|
#ifdef _DEBUG
|
|
|
|
#define D3D_DEBUG_INFO
|
|
|
|
#endif
|
|
|
|
#define DIRECT3D_VERSION 0x0900
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
|
|
|
|
#include <windows.h>
|
|
|
|
#include <d3d9.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#define USE_WINDOWS_DWORD
|
|
|
|
#include "doomtype.h"
|
|
|
|
|
|
|
|
#include "c_dispatch.h"
|
|
|
|
#include "templates.h"
|
|
|
|
#include "i_system.h"
|
|
|
|
#include "i_video.h"
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
#include "i_input.h"
|
2006-11-19 02:10:25 +00:00
|
|
|
#include "v_video.h"
|
|
|
|
#include "v_pfx.h"
|
|
|
|
#include "stats.h"
|
|
|
|
#include "doomerrors.h"
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
#include "r_draw.h"
|
2007-12-26 16:06:03 +00:00
|
|
|
#include "r_translate.h"
|
2007-12-30 04:18:39 +00:00
|
|
|
#include "f_wipe.h"
|
|
|
|
#include "st_stuff.h"
|
2006-11-19 02:10:25 +00:00
|
|
|
#include "win32iface.h"
|
|
|
|
|
|
|
|
#include <mmsystem.h>
|
|
|
|
|
|
|
|
// MACROS ------------------------------------------------------------------
|
|
|
|
|
2007-12-18 01:50:08 +00:00
|
|
|
// The number of vertices the vertex buffer should hold.
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
#define NUM_VERTS 12
|
2007-12-18 01:50:08 +00:00
|
|
|
|
2008-01-04 05:22:30 +00:00
|
|
|
// The number of line endpoints for the line vertex buffer.
|
|
|
|
#define NUM_LINE_VERTS 10240
|
|
|
|
|
2006-11-19 02:10:25 +00:00
|
|
|
// TYPES -------------------------------------------------------------------
|
|
|
|
|
|
|
|
IMPLEMENT_CLASS(D3DFB)
|
|
|
|
|
2007-12-20 04:36:43 +00:00
|
|
|
class D3DTex : public FNativeTexture
|
|
|
|
{
|
|
|
|
public:
|
2007-12-27 04:30:12 +00:00
|
|
|
D3DTex(FTexture *tex, D3DFB *fb);
|
2007-12-20 04:36:43 +00:00
|
|
|
~D3DTex();
|
|
|
|
|
|
|
|
FTexture *GameTex;
|
|
|
|
IDirect3DTexture9 *Tex;
|
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
D3DTex **Prev;
|
|
|
|
D3DTex *Next;
|
|
|
|
|
2007-12-20 04:36:43 +00:00
|
|
|
// Texture coordinates to use for the lower-right corner, should this
|
|
|
|
// texture prove to be larger than the game texture it represents.
|
|
|
|
FLOAT TX, TY;
|
|
|
|
|
|
|
|
bool IsGray;
|
|
|
|
|
|
|
|
bool Create(IDirect3DDevice9 *D3DDevice);
|
|
|
|
bool Update();
|
|
|
|
D3DFORMAT GetTexFormat();
|
|
|
|
FTextureFormat ToTexFmt(D3DFORMAT fmt);
|
|
|
|
};
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
class D3DPal : public FNativeTexture
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
D3DPal(FRemapTable *remap, D3DFB *fb);
|
|
|
|
~D3DPal();
|
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
D3DPal **Prev;
|
|
|
|
D3DPal *Next;
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
IDirect3DTexture9 *Tex;
|
|
|
|
|
|
|
|
bool Update();
|
|
|
|
|
|
|
|
FRemapTable *Remap;
|
|
|
|
int RoundedPaletteSize;
|
|
|
|
};
|
|
|
|
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
|
|
|
|
|
2006-11-19 02:10:25 +00:00
|
|
|
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
|
|
|
|
|
|
|
|
void DoBlending (const PalEntry *from, PalEntry *to, int count, int r, int g, int b, int a);
|
|
|
|
|
|
|
|
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
|
|
|
|
|
|
|
|
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
|
|
|
|
|
|
|
|
extern HWND Window;
|
|
|
|
extern IVideo *Video;
|
|
|
|
extern BOOL AppActive;
|
|
|
|
extern int SessionState;
|
|
|
|
extern bool VidResizing;
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, fullscreen)
|
|
|
|
EXTERN_CVAR (Float, Gamma)
|
|
|
|
EXTERN_CVAR (Bool, vid_vsync)
|
2007-12-20 04:36:43 +00:00
|
|
|
EXTERN_CVAR (Float, transsouls)
|
2006-11-19 02:10:25 +00:00
|
|
|
|
|
|
|
extern IDirect3D9 *D3D;
|
|
|
|
|
|
|
|
extern cycle_t BlitCycles;
|
|
|
|
|
|
|
|
// PRIVATE DATA DEFINITIONS ------------------------------------------------
|
|
|
|
|
2007-12-20 04:36:43 +00:00
|
|
|
#include "fb_d3d9_shaders.h"
|
2006-11-19 02:10:25 +00:00
|
|
|
|
|
|
|
// PUBLIC DATA DEFINITIONS -------------------------------------------------
|
|
|
|
|
2007-12-30 04:18:39 +00:00
|
|
|
CUSTOM_CVAR(Bool, test2d, true, CVAR_NOINITCALL)
|
|
|
|
{
|
|
|
|
BorderNeedRefresh = SB_state = screen->GetPageCount();
|
|
|
|
}
|
|
|
|
|
2006-11-19 02:10:25 +00:00
|
|
|
// CODE --------------------------------------------------------------------
|
|
|
|
|
|
|
|
D3DFB::D3DFB (int width, int height, bool fullscreen)
|
|
|
|
: BaseWinFB (width, height)
|
|
|
|
{
|
|
|
|
D3DPRESENT_PARAMETERS d3dpp;
|
|
|
|
|
|
|
|
D3DDevice = NULL;
|
2008-01-04 05:22:30 +00:00
|
|
|
LineBuffer = NULL;
|
2006-11-19 02:10:25 +00:00
|
|
|
FBTexture = NULL;
|
2007-12-30 04:18:39 +00:00
|
|
|
TempRenderTexture = NULL;
|
|
|
|
InitialWipeScreen = NULL;
|
|
|
|
FinalWipeScreen = NULL;
|
2006-11-19 02:10:25 +00:00
|
|
|
PaletteTexture = NULL;
|
2007-12-20 04:36:43 +00:00
|
|
|
StencilPaletteTexture = NULL;
|
|
|
|
ShadedPaletteTexture = NULL;
|
2006-11-19 02:10:25 +00:00
|
|
|
PalTexShader = NULL;
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
PalTexBilinearShader = NULL;
|
2007-12-27 04:30:12 +00:00
|
|
|
PlainShader = NULL;
|
|
|
|
PlainStencilShader = NULL;
|
2008-01-04 05:22:30 +00:00
|
|
|
ColorOnlyShader = NULL;
|
2007-12-27 04:30:12 +00:00
|
|
|
GammaFixerShader = NULL;
|
2008-01-01 03:07:05 +00:00
|
|
|
BurnShader = NULL;
|
2006-11-19 02:10:25 +00:00
|
|
|
FBFormat = D3DFMT_UNKNOWN;
|
|
|
|
PalFormat = D3DFMT_UNKNOWN;
|
|
|
|
VSync = vid_vsync;
|
2007-12-18 01:50:08 +00:00
|
|
|
BlendingRect.left = 0;
|
|
|
|
BlendingRect.top = 0;
|
|
|
|
BlendingRect.right = FBWidth;
|
|
|
|
BlendingRect.bottom = FBHeight;
|
2007-12-20 04:36:43 +00:00
|
|
|
In2D = 0;
|
2007-12-27 04:30:12 +00:00
|
|
|
Palettes = NULL;
|
|
|
|
Textures = NULL;
|
|
|
|
Accel2D = true;
|
2007-12-30 04:18:39 +00:00
|
|
|
GatheringWipeScreen = false;
|
2008-01-01 03:07:05 +00:00
|
|
|
ScreenWipe = NULL;
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
InScene = false;
|
2006-11-19 02:10:25 +00:00
|
|
|
|
|
|
|
Gamma = 1.0;
|
2008-01-04 05:22:30 +00:00
|
|
|
FlashColor0 = 0;
|
|
|
|
FlashColor1 = 0xFFFFFFFF;
|
2006-11-19 02:10:25 +00:00
|
|
|
FlashColor = 0;
|
|
|
|
FlashAmount = 0;
|
|
|
|
|
|
|
|
NeedGammaUpdate = false;
|
|
|
|
NeedPalUpdate = false;
|
|
|
|
|
|
|
|
if (MemBuffer == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy (SourcePalette, GPalette.BaseColors, sizeof(PalEntry)*256);
|
|
|
|
|
|
|
|
Windowed = !(static_cast<Win32Video *>(Video)->GoFullscreen (fullscreen));
|
|
|
|
|
|
|
|
TrueHeight = height;
|
|
|
|
if (fullscreen)
|
|
|
|
{
|
|
|
|
for (Win32Video::ModeInfo *mode = static_cast<Win32Video *>(Video)->m_Modes; mode != NULL; mode = mode->next)
|
|
|
|
{
|
|
|
|
if (mode->width == Width && mode->height == Height)
|
|
|
|
{
|
|
|
|
TrueHeight = mode->realheight;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-12-28 03:30:05 +00:00
|
|
|
// Offset from top of screen to top of letterboxed screen
|
|
|
|
LBOffsetI = (TrueHeight - Height) / 2;
|
|
|
|
LBOffset = float(LBOffsetI);
|
2006-11-19 02:10:25 +00:00
|
|
|
|
|
|
|
FillPresentParameters (&d3dpp, fullscreen, VSync);
|
|
|
|
|
|
|
|
HRESULT hr;
|
|
|
|
|
|
|
|
if (FAILED(hr = D3D->CreateDevice (D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, Window,
|
2007-01-19 02:45:26 +00:00
|
|
|
D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &d3dpp, &D3DDevice)))
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
|
|
|
D3DDevice = NULL;
|
|
|
|
if (fullscreen)
|
|
|
|
{
|
|
|
|
d3dpp.BackBufferFormat = D3DFMT_R5G6B5;
|
|
|
|
if (FAILED(D3D->CreateDevice (D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, Window,
|
2007-12-20 04:36:43 +00:00
|
|
|
D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &d3dpp, &D3DDevice)))
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
|
|
|
D3DDevice = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (D3DDevice != NULL)
|
|
|
|
{
|
|
|
|
CreateResources ();
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetInitialState ();
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
D3DFB::~D3DFB ()
|
|
|
|
{
|
|
|
|
ReleaseResources ();
|
|
|
|
if (D3DDevice != NULL)
|
|
|
|
{
|
|
|
|
D3DDevice->Release();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
// Called after initial device creation and reset, when everything is set
|
|
|
|
// to D3D's defaults.
|
|
|
|
void D3DFB::SetInitialState()
|
|
|
|
{
|
|
|
|
D3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
|
|
|
|
AlphaBlendEnabled = FALSE;
|
|
|
|
AlphaSrcBlend = D3DBLEND(0);
|
|
|
|
AlphaDestBlend = D3DBLEND(0);
|
|
|
|
|
|
|
|
CurPixelShader = NULL;
|
|
|
|
memset(Constant, 0, sizeof(Constant));
|
|
|
|
|
|
|
|
Texture[0] = NULL;
|
|
|
|
Texture[1] = NULL;
|
|
|
|
D3DDevice->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);
|
|
|
|
D3DDevice->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);
|
|
|
|
D3DDevice->SetSamplerState(1, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);
|
|
|
|
D3DDevice->SetSamplerState(1, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);
|
|
|
|
|
2008-01-04 05:22:30 +00:00
|
|
|
D3DDevice->SetRenderState(D3DRS_ANTIALIASEDLINEENABLE, TRUE);
|
|
|
|
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetGamma (Gamma);
|
|
|
|
OldRenderTarget = NULL;
|
|
|
|
}
|
|
|
|
|
2006-11-19 02:10:25 +00:00
|
|
|
void D3DFB::FillPresentParameters (D3DPRESENT_PARAMETERS *pp, bool fullscreen, bool vsync)
|
|
|
|
{
|
|
|
|
memset (pp, 0, sizeof(*pp));
|
|
|
|
pp->Windowed = !fullscreen;
|
|
|
|
pp->SwapEffect = D3DSWAPEFFECT_DISCARD;
|
|
|
|
pp->BackBufferWidth = Width;
|
|
|
|
pp->BackBufferHeight = TrueHeight;
|
2007-12-30 04:18:39 +00:00
|
|
|
pp->BackBufferFormat = fullscreen ? D3DFMT_A8R8G8B8 : D3DFMT_UNKNOWN;
|
2006-11-19 02:10:25 +00:00
|
|
|
pp->hDeviceWindow = Window;
|
|
|
|
pp->PresentationInterval = vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::CreateResources ()
|
|
|
|
{
|
|
|
|
if (!Windowed)
|
|
|
|
{
|
|
|
|
// Remove the window border in fullscreen mode
|
2007-02-13 00:10:16 +00:00
|
|
|
SetWindowLong (Window, GWL_STYLE, WS_POPUP|WS_VISIBLE|WS_SYSMENU);
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Resize the window to match desired dimensions
|
|
|
|
int sizew = Width + GetSystemMetrics (SM_CXSIZEFRAME)*2;
|
|
|
|
int sizeh = Height + GetSystemMetrics (SM_CYSIZEFRAME) * 2 +
|
|
|
|
GetSystemMetrics (SM_CYCAPTION);
|
|
|
|
LOG2 ("Resize window to %dx%d\n", sizew, sizeh);
|
|
|
|
VidResizing = true;
|
|
|
|
// Make sure the window has a border in windowed mode
|
2007-02-13 00:10:16 +00:00
|
|
|
SetWindowLong (Window, GWL_STYLE, WS_VISIBLE|WS_OVERLAPPEDWINDOW);
|
2006-11-21 05:43:34 +00:00
|
|
|
if (GetWindowLong (Window, GWL_EXSTYLE) & WS_EX_TOPMOST)
|
|
|
|
{
|
|
|
|
// Direct3D 9 will apparently add WS_EX_TOPMOST to fullscreen windows,
|
|
|
|
// and removing it is a little tricky. Using SetWindowLongPtr to clear it
|
|
|
|
// will not do the trick, but sending the window behind everything will.
|
|
|
|
SetWindowPos (Window, HWND_BOTTOM, 0, 0, sizew, sizeh,
|
|
|
|
SWP_DRAWFRAME | SWP_NOCOPYBITS | SWP_NOMOVE);
|
|
|
|
SetWindowPos (Window, HWND_TOP, 0, 0, 0, 0, SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOSIZE);
|
|
|
|
}
|
|
|
|
else
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
2006-11-21 05:43:34 +00:00
|
|
|
SetWindowPos (Window, NULL, 0, 0, sizew, sizeh,
|
|
|
|
SWP_DRAWFRAME | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOZORDER);
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
2007-02-13 00:10:16 +00:00
|
|
|
I_RestoreWindowedPos ();
|
2006-11-19 02:10:25 +00:00
|
|
|
VidResizing = false;
|
|
|
|
}
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
SM14 = false;
|
|
|
|
if (FAILED(D3DDevice->CreatePixelShader (PalTexShader20Def, &PalTexShader)) &&
|
|
|
|
(SM14 = true, FAILED(D3DDevice->CreatePixelShader (PalTexShader14Def, &PalTexShader))))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (FAILED(D3DDevice->CreatePixelShader (PlainShaderDef, &PlainShader)) ||
|
2007-12-27 04:30:12 +00:00
|
|
|
FAILED(D3DDevice->CreatePixelShader (PlainStencilDef, &PlainStencilShader)) ||
|
2008-01-04 05:22:30 +00:00
|
|
|
FAILED(D3DDevice->CreatePixelShader (ColorOnlyDef, &ColorOnlyShader)))
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2007-12-27 04:30:12 +00:00
|
|
|
if (FAILED(D3DDevice->CreatePixelShader (GammaFixerDef, &GammaFixerShader)))
|
|
|
|
{
|
2007-12-28 01:54:14 +00:00
|
|
|
Printf ("Windowed mode gamma will not work.\n");
|
2007-12-27 04:30:12 +00:00
|
|
|
GammaFixerShader = NULL;
|
|
|
|
}
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
if (FAILED(D3DDevice->CreatePixelShader(PalTexBilinearDef, &PalTexBilinearShader)))
|
|
|
|
{
|
|
|
|
PalTexBilinearShader = PalTexShader;
|
|
|
|
}
|
2008-01-01 03:07:05 +00:00
|
|
|
if (FAILED(D3DDevice->CreatePixelShader (BurnShaderDef, &BurnShader)))
|
|
|
|
{
|
|
|
|
Printf ("Burn screenwipe will not work in D3D mode.\n");
|
|
|
|
BurnShader = NULL;
|
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
if (!CreateFBTexture() ||
|
|
|
|
!CreatePaletteTexture() ||
|
|
|
|
!CreateStencilPaletteTexture() ||
|
|
|
|
!CreateShadedPaletteTexture())
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!CreateVertexes())
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::ReleaseResources ()
|
|
|
|
{
|
2007-02-13 00:10:16 +00:00
|
|
|
I_SaveWindowedPos ();
|
2008-01-01 03:07:05 +00:00
|
|
|
KillNativeTexs();
|
|
|
|
KillNativePals();
|
|
|
|
ReleaseDefaultPoolItems();
|
2006-11-19 02:10:25 +00:00
|
|
|
if (PaletteTexture != NULL)
|
|
|
|
{
|
|
|
|
PaletteTexture->Release();
|
|
|
|
PaletteTexture = NULL;
|
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
if (StencilPaletteTexture != NULL)
|
|
|
|
{
|
|
|
|
StencilPaletteTexture->Release();
|
|
|
|
StencilPaletteTexture = NULL;
|
|
|
|
}
|
|
|
|
if (ShadedPaletteTexture != NULL)
|
|
|
|
{
|
|
|
|
ShadedPaletteTexture->Release();
|
|
|
|
ShadedPaletteTexture = NULL;
|
|
|
|
}
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
if (PalTexBilinearShader != NULL)
|
|
|
|
{
|
|
|
|
if (PalTexBilinearShader != PalTexShader)
|
|
|
|
{
|
|
|
|
PalTexBilinearShader->Release();
|
|
|
|
}
|
|
|
|
PalTexBilinearShader = NULL;
|
|
|
|
}
|
2006-11-19 02:10:25 +00:00
|
|
|
if (PalTexShader != NULL)
|
|
|
|
{
|
|
|
|
PalTexShader->Release();
|
|
|
|
PalTexShader = NULL;
|
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
if (PlainShader != NULL)
|
|
|
|
{
|
|
|
|
PlainShader->Release();
|
|
|
|
PlainShader = NULL;
|
|
|
|
}
|
2007-12-27 04:30:12 +00:00
|
|
|
if (PlainStencilShader != NULL)
|
|
|
|
{
|
|
|
|
PlainStencilShader->Release();
|
|
|
|
PlainStencilShader = NULL;
|
|
|
|
}
|
2008-01-04 05:22:30 +00:00
|
|
|
if (ColorOnlyShader != NULL)
|
2007-12-22 04:52:51 +00:00
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
ColorOnlyShader->Release();
|
|
|
|
ColorOnlyShader = NULL;
|
2007-12-22 04:52:51 +00:00
|
|
|
}
|
2007-12-27 04:30:12 +00:00
|
|
|
if (GammaFixerShader != NULL)
|
|
|
|
{
|
|
|
|
GammaFixerShader->Release();
|
|
|
|
GammaFixerShader = NULL;
|
|
|
|
}
|
2008-01-01 03:07:05 +00:00
|
|
|
if (BurnShader != NULL)
|
|
|
|
{
|
|
|
|
BurnShader->Release();
|
|
|
|
BurnShader = NULL;
|
|
|
|
}
|
|
|
|
if (ScreenWipe != NULL)
|
|
|
|
{
|
|
|
|
delete ScreenWipe;
|
|
|
|
ScreenWipe = NULL;
|
|
|
|
}
|
|
|
|
GatheringWipeScreen = false;
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
|
|
|
|
2008-01-01 03:07:05 +00:00
|
|
|
// Free resources created with D3DPOOL_DEFAULT.
|
|
|
|
void D3DFB::ReleaseDefaultPoolItems()
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
|
|
|
if (FBTexture != NULL)
|
|
|
|
{
|
|
|
|
FBTexture->Release();
|
|
|
|
FBTexture = NULL;
|
|
|
|
}
|
2008-01-01 03:07:05 +00:00
|
|
|
if (FinalWipeScreen != NULL)
|
|
|
|
{
|
|
|
|
if (FinalWipeScreen != TempRenderTexture)
|
|
|
|
{
|
|
|
|
FinalWipeScreen->Release();
|
|
|
|
}
|
|
|
|
FinalWipeScreen = NULL;
|
|
|
|
}
|
2007-12-30 04:18:39 +00:00
|
|
|
if (TempRenderTexture != NULL)
|
2007-12-27 04:30:12 +00:00
|
|
|
{
|
2007-12-30 04:18:39 +00:00
|
|
|
TempRenderTexture->Release();
|
|
|
|
TempRenderTexture = NULL;
|
2007-12-27 04:30:12 +00:00
|
|
|
}
|
2008-01-01 03:07:05 +00:00
|
|
|
if (InitialWipeScreen != NULL)
|
|
|
|
{
|
|
|
|
InitialWipeScreen->Release();
|
|
|
|
InitialWipeScreen = NULL;
|
|
|
|
}
|
2008-01-04 05:22:30 +00:00
|
|
|
if (LineBuffer != NULL)
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
LineBuffer->Release();
|
|
|
|
LineBuffer = NULL;
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::Reset ()
|
|
|
|
{
|
|
|
|
D3DPRESENT_PARAMETERS d3dpp;
|
|
|
|
|
|
|
|
ReleaseDefaultPoolItems();
|
2006-11-19 02:10:25 +00:00
|
|
|
FillPresentParameters (&d3dpp, !Windowed, VSync);
|
|
|
|
if (!SUCCEEDED(D3DDevice->Reset (&d3dpp)))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!CreateFBTexture() || !CreateVertexes())
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetInitialState();
|
2006-11-19 02:10:25 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: KillNativePals
|
|
|
|
//
|
|
|
|
// Frees all native palettes.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::KillNativePals()
|
|
|
|
{
|
|
|
|
while (Palettes != NULL)
|
|
|
|
{
|
|
|
|
delete Palettes;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: KillNativeTexs
|
|
|
|
//
|
|
|
|
// Frees all native textures.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::KillNativeTexs()
|
|
|
|
{
|
|
|
|
while (Textures != NULL)
|
|
|
|
{
|
|
|
|
delete Textures;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-11-19 02:10:25 +00:00
|
|
|
bool D3DFB::CreateFBTexture ()
|
|
|
|
{
|
|
|
|
if (FAILED(D3DDevice->CreateTexture (Width, Height, 1, D3DUSAGE_DYNAMIC, D3DFMT_L8, D3DPOOL_DEFAULT, &FBTexture, NULL)))
|
|
|
|
{
|
|
|
|
int pow2width, pow2height, i;
|
|
|
|
|
|
|
|
for (i = 1; i < Width; i <<= 1) {} pow2width = i;
|
|
|
|
for (i = 1; i < Height; i <<= 1) {} pow2height = i;
|
|
|
|
|
|
|
|
if (FAILED(D3DDevice->CreateTexture (pow2width, pow2height, 1, D3DUSAGE_DYNAMIC, D3DFMT_L8, D3DPOOL_DEFAULT, &FBTexture, NULL)))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FBWidth = pow2width;
|
|
|
|
FBHeight = pow2height;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FBWidth = Width;
|
|
|
|
FBHeight = Height;
|
|
|
|
}
|
2007-12-30 04:18:39 +00:00
|
|
|
if (FAILED(D3DDevice->CreateTexture (FBWidth, FBHeight, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &TempRenderTexture, NULL)))
|
2007-12-27 04:30:12 +00:00
|
|
|
{
|
2007-12-30 04:18:39 +00:00
|
|
|
TempRenderTexture = NULL;
|
2007-12-27 04:30:12 +00:00
|
|
|
}
|
2006-11-19 02:10:25 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::CreatePaletteTexture ()
|
|
|
|
{
|
|
|
|
if (FAILED(D3DDevice->CreateTexture (256, 1, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &PaletteTexture, NULL)))
|
|
|
|
{
|
2007-12-20 04:36:43 +00:00
|
|
|
return false;
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
PalFormat = D3DFMT_A8R8G8B8;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::CreateStencilPaletteTexture()
|
|
|
|
{
|
|
|
|
// The stencil palette is a special palette where the first entry is zero alpha,
|
|
|
|
// and everything else is white with full alpha.
|
|
|
|
if (FAILED(D3DDevice->CreateTexture(256, 1, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &StencilPaletteTexture, NULL)))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
D3DLOCKED_RECT lockrect;
|
|
|
|
if (SUCCEEDED(StencilPaletteTexture->LockRect(0, &lockrect, NULL, 0)))
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
2007-12-20 04:36:43 +00:00
|
|
|
DWORD *pix = (DWORD *)lockrect.pBits;
|
|
|
|
*pix = 0;
|
|
|
|
memset(pix + 1, 0xFF, 255*4);
|
|
|
|
StencilPaletteTexture->UnlockRect(0);
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::CreateShadedPaletteTexture()
|
|
|
|
{
|
|
|
|
// The shaded palette is similar to the stencil palette, except each entry's
|
|
|
|
// alpha is the same as its index.
|
|
|
|
if (FAILED(D3DDevice->CreateTexture(256, 1, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &ShadedPaletteTexture, NULL)))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
D3DLOCKED_RECT lockrect;
|
|
|
|
if (SUCCEEDED(ShadedPaletteTexture->LockRect(0, &lockrect, NULL, 0)))
|
|
|
|
{
|
|
|
|
BYTE *pix = (BYTE *)lockrect.pBits;
|
|
|
|
for (int i = 0; i < 256; ++i)
|
|
|
|
{
|
|
|
|
pix[3] = i;
|
|
|
|
pix[2] = pix[1] = pix[0] = 255;
|
|
|
|
pix += 4;
|
|
|
|
}
|
|
|
|
ShadedPaletteTexture->UnlockRect(0);
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::CreateVertexes ()
|
2007-12-18 01:50:08 +00:00
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
if (FAILED(D3DDevice->CreateVertexBuffer(sizeof(FBVERTEX)*NUM_LINE_VERTS,
|
|
|
|
D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_FBVERTEX, D3DPOOL_DEFAULT, &LineBuffer, NULL)))
|
2007-12-18 01:50:08 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2008-01-04 05:22:30 +00:00
|
|
|
LineBatchPos = -1;
|
2007-12-18 01:50:08 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2008-01-04 05:22:30 +00:00
|
|
|
void D3DFB::CalcFullscreenCoords (FBVERTEX verts[4], bool viewarea_only, D3DCOLOR color0, D3DCOLOR color1) const
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
float offset = OldRenderTarget != NULL ? 0 : LBOffset;
|
|
|
|
float top = offset - 0.5f;
|
2006-11-19 02:10:25 +00:00
|
|
|
float texright = float(Width) / float(FBWidth);
|
|
|
|
float texbot = float(Height) / float(FBHeight);
|
2008-01-04 05:22:30 +00:00
|
|
|
float mxl, mxr, myt, myb, tmxl, tmxr, tmyt, tmyb;
|
|
|
|
|
|
|
|
if (viewarea_only)
|
|
|
|
{ // Just calculate vertices for the viewarea/BlendingRect
|
|
|
|
mxl = float(BlendingRect.left) - 0.5f;
|
|
|
|
mxr = float(BlendingRect.right) - 0.5f;
|
|
|
|
myt = float(BlendingRect.top) + top;
|
|
|
|
myb = float(BlendingRect.bottom) + top;
|
|
|
|
tmxl = float(BlendingRect.left) / float(Width) * texright;
|
|
|
|
tmxr = float(BlendingRect.right) / float(Width) * texright;
|
|
|
|
tmyt = float(BlendingRect.top) / float(Height) * texbot;
|
|
|
|
tmyb = float(BlendingRect.bottom) / float(Height) * texbot;
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
2008-01-04 05:22:30 +00:00
|
|
|
else
|
|
|
|
{ // Calculate vertices for the whole screen
|
|
|
|
mxl = -0.5f;
|
|
|
|
mxr = float(Width) - 0.5f;
|
|
|
|
myt = top;
|
|
|
|
myb = float(Height) + top;
|
|
|
|
tmxl = 0;
|
|
|
|
tmxr = texright;
|
|
|
|
tmyt = 0;
|
|
|
|
tmyb = texbot;
|
|
|
|
}
|
|
|
|
|
|
|
|
//{ mxl, myt, 0, 1, 0, 0xFFFFFFFF, tmxl, tmyt },
|
|
|
|
//{ mxr, myt, 0, 1, 0, 0xFFFFFFFF, tmxr, tmyt },
|
|
|
|
//{ mxr, myb, 0, 1, 0, 0xFFFFFFFF, tmxr, tmyb },
|
|
|
|
//{ mxl, myb, 0, 1, 0, 0xFFFFFFFF, tmxl, tmyb },
|
|
|
|
|
|
|
|
verts[0].x = mxl;
|
|
|
|
verts[0].y = myt;
|
|
|
|
verts[0].z = 0;
|
|
|
|
verts[0].rhw = 1;
|
|
|
|
verts[0].color0 = color0;
|
|
|
|
verts[0].color1 = color1;
|
|
|
|
verts[0].tu = tmxl;
|
|
|
|
verts[0].tv = tmyt;
|
|
|
|
|
|
|
|
verts[1].x = mxr;
|
|
|
|
verts[1].y = myt;
|
|
|
|
verts[1].z = 0;
|
|
|
|
verts[1].rhw = 1;
|
|
|
|
verts[1].color0 = color0;
|
|
|
|
verts[1].color1 = color1;
|
|
|
|
verts[1].tu = tmxr;
|
|
|
|
verts[1].tv = tmyt;
|
|
|
|
|
|
|
|
verts[2].x = mxr;
|
|
|
|
verts[2].y = myb;
|
|
|
|
verts[2].z = 0;
|
|
|
|
verts[2].rhw = 1;
|
|
|
|
verts[2].color0 = color0;
|
|
|
|
verts[2].color1 = color1;
|
|
|
|
verts[2].tu = tmxr;
|
|
|
|
verts[2].tv = tmyb;
|
|
|
|
|
|
|
|
verts[3].x = mxl;
|
|
|
|
verts[3].y = myb;
|
|
|
|
verts[3].z = 0;
|
|
|
|
verts[3].rhw = 1;
|
|
|
|
verts[3].color0 = color0;
|
|
|
|
verts[3].color1 = color1;
|
|
|
|
verts[3].tu = tmxl;
|
|
|
|
verts[3].tv = tmyb;
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int D3DFB::GetPageCount ()
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::PaletteChanged ()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
int D3DFB::QueryNewPalette ()
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::IsValid ()
|
|
|
|
{
|
|
|
|
return D3DDevice != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
HRESULT D3DFB::GetHR ()
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::IsFullscreen ()
|
|
|
|
{
|
|
|
|
return !Windowed;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::Lock ()
|
|
|
|
{
|
|
|
|
return Lock(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::Lock (bool buffered)
|
|
|
|
{
|
|
|
|
if (LockCount++ > 0)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
Buffer = MemBuffer;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::Unlock ()
|
|
|
|
{
|
|
|
|
LOG1 ("Unlock <%d>\n", LockCount);
|
|
|
|
|
|
|
|
if (LockCount == 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (UpdatePending && LockCount == 1)
|
|
|
|
{
|
|
|
|
Update ();
|
|
|
|
}
|
|
|
|
else if (--LockCount == 0)
|
|
|
|
{
|
|
|
|
Buffer = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-20 04:36:43 +00:00
|
|
|
// When In2D == 0: Copy buffer to screen and present
|
|
|
|
// When In2D == 1: Copy buffer to screen but do not present
|
2008-01-02 05:21:48 +00:00
|
|
|
// When In2D == 2: Set up for 2D drawing but do not draw anything
|
|
|
|
// When In2D == 3: Present and set In2D to 0
|
2006-11-19 02:10:25 +00:00
|
|
|
void D3DFB::Update ()
|
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
if (In2D == 3)
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
if (InScene)
|
|
|
|
{
|
|
|
|
DrawRateStuff();
|
|
|
|
DoWindowedGamma();
|
|
|
|
D3DDevice->EndScene();
|
|
|
|
D3DDevice->Present(NULL, NULL, NULL, NULL);
|
|
|
|
InScene = false;
|
|
|
|
}
|
2007-12-22 04:00:25 +00:00
|
|
|
In2D = 0;
|
2007-12-20 04:36:43 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-11-19 02:10:25 +00:00
|
|
|
if (LockCount != 1)
|
|
|
|
{
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
I_FatalError ("Framebuffer must have exactly 1 lock to be updated");
|
2006-11-19 02:10:25 +00:00
|
|
|
if (LockCount > 0)
|
|
|
|
{
|
|
|
|
UpdatePending = true;
|
|
|
|
--LockCount;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
if (In2D == 0)
|
|
|
|
{
|
|
|
|
DrawRateStuff();
|
|
|
|
}
|
2006-11-19 02:10:25 +00:00
|
|
|
|
|
|
|
if (NeedGammaUpdate)
|
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
float psgamma[4];
|
|
|
|
float igamma;
|
|
|
|
|
2006-11-19 02:10:25 +00:00
|
|
|
NeedGammaUpdate = false;
|
2007-12-27 04:30:12 +00:00
|
|
|
igamma = 1 / Gamma;
|
|
|
|
if (!Windowed)
|
|
|
|
{
|
|
|
|
D3DGAMMARAMP ramp;
|
|
|
|
|
|
|
|
for (int i = 0; i < 256; ++i)
|
|
|
|
{
|
|
|
|
ramp.blue[i] = ramp.green[i] = ramp.red[i] = WORD(65535.f * powf(i / 255.f, igamma));
|
|
|
|
}
|
|
|
|
D3DDevice->SetGammaRamp(0, D3DSGR_CALIBRATE, &ramp);
|
|
|
|
}
|
|
|
|
psgamma[2] = psgamma[1] = psgamma[0] = igamma;
|
|
|
|
psgamma[3] = 1;
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
D3DDevice->SetPixelShaderConstantF(7, psgamma, 1);
|
2006-11-19 02:10:25 +00:00
|
|
|
NeedPalUpdate = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (NeedPalUpdate)
|
|
|
|
{
|
|
|
|
UploadPalette();
|
|
|
|
}
|
|
|
|
|
|
|
|
BlitCycles = 0;
|
|
|
|
clock (BlitCycles);
|
|
|
|
|
|
|
|
LockCount = 0;
|
2008-01-02 05:21:48 +00:00
|
|
|
HRESULT hr = D3DDevice->TestCooperativeLevel();
|
|
|
|
if (FAILED(hr) && (hr != D3DERR_DEVICENOTRESET || !Reset()))
|
|
|
|
{
|
|
|
|
Sleep(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
Draw3DPart(In2D <= 1);
|
2007-12-20 04:36:43 +00:00
|
|
|
if (In2D == 0)
|
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
DoWindowedGamma();
|
2007-12-20 04:36:43 +00:00
|
|
|
D3DDevice->EndScene();
|
|
|
|
D3DDevice->Present(NULL, NULL, NULL, NULL);
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
InScene = false;
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
2006-11-19 02:10:25 +00:00
|
|
|
|
|
|
|
unclock (BlitCycles);
|
|
|
|
LOG1 ("cycles = %d\n", BlitCycles);
|
|
|
|
|
|
|
|
Buffer = NULL;
|
|
|
|
UpdatePending = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::PaintToWindow ()
|
|
|
|
{
|
|
|
|
HRESULT hr;
|
|
|
|
|
|
|
|
if (LockCount != 0)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
hr = D3DDevice->TestCooperativeLevel();
|
|
|
|
if (FAILED(hr))
|
|
|
|
{
|
|
|
|
if (hr != D3DERR_DEVICENOTRESET || !Reset())
|
|
|
|
{
|
|
|
|
Sleep (1);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2008-01-02 05:21:48 +00:00
|
|
|
Draw3DPart(true);
|
2007-12-20 04:36:43 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2008-01-02 05:21:48 +00:00
|
|
|
void D3DFB::Draw3DPart(bool copy3d)
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
|
|
|
RECT texrect = { 0, 0, Width, Height };
|
|
|
|
D3DLOCKED_RECT lockrect;
|
|
|
|
|
2008-01-02 05:21:48 +00:00
|
|
|
if (copy3d)
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
if ((FBWidth == Width && FBHeight == Height &&
|
|
|
|
SUCCEEDED(FBTexture->LockRect (0, &lockrect, NULL, D3DLOCK_DISCARD))) ||
|
|
|
|
SUCCEEDED(FBTexture->LockRect (0, &lockrect, &texrect, 0)))
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
if (lockrect.Pitch == Pitch)
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
memcpy (lockrect.pBits, MemBuffer, Width * Height);
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
2008-01-02 05:21:48 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
BYTE *dest = (BYTE *)lockrect.pBits;
|
|
|
|
BYTE *src = MemBuffer;
|
|
|
|
for (int y = 0; y < Height; y++)
|
|
|
|
{
|
|
|
|
memcpy (dest, src, Width);
|
|
|
|
dest += lockrect.Pitch;
|
|
|
|
src += Pitch;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FBTexture->UnlockRect (0);
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
|
|
|
}
|
2007-12-30 04:18:39 +00:00
|
|
|
DrawLetterbox();
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
InScene = true;
|
2006-11-19 02:10:25 +00:00
|
|
|
D3DDevice->BeginScene();
|
2008-01-02 05:21:48 +00:00
|
|
|
assert(OldRenderTarget == NULL);
|
2007-12-30 04:18:39 +00:00
|
|
|
if (TempRenderTexture != NULL &&
|
|
|
|
((Windowed && GammaFixerShader && TempRenderTexture != FinalWipeScreen) || GatheringWipeScreen))
|
2007-12-27 04:30:12 +00:00
|
|
|
{
|
|
|
|
IDirect3DSurface9 *targetsurf;
|
2008-01-02 05:21:48 +00:00
|
|
|
if (SUCCEEDED(TempRenderTexture->GetSurfaceLevel(0, &targetsurf)))
|
2007-12-27 04:30:12 +00:00
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
if (SUCCEEDED(D3DDevice->GetRenderTarget(0, &OldRenderTarget)))
|
|
|
|
{
|
|
|
|
if (FAILED(D3DDevice->SetRenderTarget(0, targetsurf)))
|
|
|
|
{
|
|
|
|
// Setting the render target failed.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
targetsurf->Release();
|
2007-12-27 04:30:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
SetTexture (0, FBTexture);
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetPaletteTexture(PaletteTexture, 256, false);
|
2006-11-19 02:10:25 +00:00
|
|
|
D3DDevice->SetFVF (D3DFVF_FBVERTEX);
|
2008-01-04 05:22:30 +00:00
|
|
|
memset(Constant, 0, sizeof(Constant));
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
SetAlphaBlend(FALSE);
|
2008-01-02 05:21:48 +00:00
|
|
|
if (copy3d)
|
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
FBVERTEX verts[4];
|
|
|
|
CalcFullscreenCoords(verts, test2d, FlashColor0, FlashColor1);
|
|
|
|
D3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, verts, sizeof(FBVERTEX));
|
2007-12-27 04:30:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-30 04:18:39 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: DrawLetterbox
|
|
|
|
//
|
|
|
|
// Draws the black bars at the top and bottom of the screen for letterboxed
|
|
|
|
// modes.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::DrawLetterbox()
|
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
if (LBOffsetI != 0)
|
2007-12-30 04:18:39 +00:00
|
|
|
{
|
|
|
|
D3DRECT rects[2] = { { 0, 0, Width, LBOffsetI }, { 0, Height + LBOffsetI, Width, TrueHeight } };
|
|
|
|
D3DDevice->Clear (2, rects, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0,0,0), 1.f, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: DoWindowedGamma
|
|
|
|
//
|
|
|
|
// Draws the render target texture to the real back buffer using a gamma-
|
|
|
|
// correcting pixel shader.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
2007-12-18 01:50:08 +00:00
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
void D3DFB::DoWindowedGamma()
|
|
|
|
{
|
|
|
|
if (OldRenderTarget != NULL)
|
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
FBVERTEX verts[4];
|
|
|
|
|
|
|
|
CalcFullscreenCoords(verts, false, 0, 0xFFFFFFFF);
|
2007-12-27 04:30:12 +00:00
|
|
|
D3DDevice->SetRenderTarget(0, OldRenderTarget);
|
|
|
|
D3DDevice->SetFVF(D3DFVF_FBVERTEX);
|
2007-12-30 04:18:39 +00:00
|
|
|
SetTexture(0, TempRenderTexture);
|
|
|
|
SetPixelShader((Windowed && GammaFixerShader != NULL) ? GammaFixerShader : PlainShader);
|
2007-12-27 04:30:12 +00:00
|
|
|
SetAlphaBlend(FALSE);
|
2008-01-04 05:22:30 +00:00
|
|
|
D3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, verts, sizeof(FBVERTEX));
|
2008-01-02 05:21:48 +00:00
|
|
|
OldRenderTarget->Release();
|
2007-12-27 04:30:12 +00:00
|
|
|
OldRenderTarget = NULL;
|
2007-12-18 01:50:08 +00:00
|
|
|
}
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::UploadPalette ()
|
|
|
|
{
|
|
|
|
D3DLOCKED_RECT lockrect;
|
2006-12-01 01:17:45 +00:00
|
|
|
int i;
|
2006-11-19 02:10:25 +00:00
|
|
|
|
|
|
|
if (SUCCEEDED(PaletteTexture->LockRect (0, &lockrect, NULL, 0)))
|
|
|
|
{
|
2007-12-20 04:36:43 +00:00
|
|
|
BYTE *pix = (BYTE *)lockrect.pBits;
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
for (i = 0; i < 256; ++i, pix += 4)
|
2006-11-19 02:10:25 +00:00
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
pix[0] = SourcePalette[i].b;
|
|
|
|
pix[1] = SourcePalette[i].g;
|
|
|
|
pix[2] = SourcePalette[i].r;
|
2007-12-20 04:36:43 +00:00
|
|
|
pix[3] = (i == 0 ? 0 : 255);
|
|
|
|
// To let masked textures work, the first palette entry's alpha is 0.
|
2006-11-19 02:10:25 +00:00
|
|
|
}
|
|
|
|
PaletteTexture->UnlockRect (0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PalEntry *D3DFB::GetPalette ()
|
|
|
|
{
|
|
|
|
return SourcePalette;
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::UpdatePalette ()
|
|
|
|
{
|
|
|
|
NeedPalUpdate = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::SetGamma (float gamma)
|
|
|
|
{
|
|
|
|
LOG1 ("SetGamma %g\n", gamma);
|
|
|
|
Gamma = gamma;
|
|
|
|
NeedGammaUpdate = true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool D3DFB::SetFlash (PalEntry rgb, int amount)
|
|
|
|
{
|
|
|
|
FlashColor = rgb;
|
|
|
|
FlashAmount = amount;
|
|
|
|
|
|
|
|
// Fill in the constants for the pixel shader to do linear interpolation between the palette and the flash:
|
|
|
|
float r = rgb.r / 255.f, g = rgb.g / 255.f, b = rgb.b / 255.f, a = amount / 256.f;
|
2008-01-04 05:22:30 +00:00
|
|
|
FlashColor0 = D3DCOLOR_COLORVALUE(r * a, g * a, b * a, 0);
|
2006-11-19 02:10:25 +00:00
|
|
|
a = 1 - a;
|
2008-01-04 05:22:30 +00:00
|
|
|
FlashColor1 = D3DCOLOR_COLORVALUE(a, a, a, 1);
|
2006-11-19 02:10:25 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::GetFlash (PalEntry &rgb, int &amount)
|
|
|
|
{
|
|
|
|
rgb = FlashColor;
|
|
|
|
amount = FlashAmount;
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::GetFlashedPalette (PalEntry pal[256])
|
|
|
|
{
|
|
|
|
memcpy (pal, SourcePalette, 256*sizeof(PalEntry));
|
|
|
|
if (FlashAmount)
|
|
|
|
{
|
|
|
|
DoBlending (pal, pal, 256, FlashColor.r, FlashColor.g, FlashColor.b, FlashAmount);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::SetVSync (bool vsync)
|
|
|
|
{
|
|
|
|
if (VSync != vsync)
|
|
|
|
{
|
|
|
|
VSync = vsync;
|
|
|
|
Reset();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::Blank ()
|
|
|
|
{
|
|
|
|
// Only used by movie player, which isn't working with D3D9 yet.
|
|
|
|
}
|
2007-12-18 01:50:08 +00:00
|
|
|
|
|
|
|
void D3DFB::SetBlendingRect(int x1, int y1, int x2, int y2)
|
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
BlendingRect.left = x1;
|
|
|
|
BlendingRect.top = y1;
|
|
|
|
BlendingRect.right = x2;
|
|
|
|
BlendingRect.bottom = y2;
|
2007-12-18 01:50:08 +00:00
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
/* 2D Stuff */
|
|
|
|
/**************************************************************************/
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DTex Constructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
D3DTex::D3DTex(FTexture *tex, D3DFB *fb)
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
// Attach to the texture list for the D3DFB
|
|
|
|
Next = fb->Textures;
|
|
|
|
if (Next != NULL)
|
|
|
|
{
|
|
|
|
Next->Prev = &Next;
|
|
|
|
}
|
|
|
|
Prev = &fb->Textures;
|
|
|
|
fb->Textures = this;
|
|
|
|
|
2007-12-20 04:36:43 +00:00
|
|
|
GameTex = tex;
|
|
|
|
Tex = NULL;
|
|
|
|
IsGray = false;
|
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
Create(fb->D3DDevice);
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DTex Destructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DTex::~D3DTex()
|
|
|
|
{
|
|
|
|
if (Tex != NULL)
|
|
|
|
{
|
|
|
|
Tex->Release();
|
|
|
|
Tex = NULL;
|
|
|
|
}
|
2007-12-27 04:30:12 +00:00
|
|
|
// Detach from the texture list
|
|
|
|
*Prev = Next;
|
|
|
|
if (Next != NULL)
|
|
|
|
{
|
|
|
|
Next->Prev = Prev;
|
|
|
|
}
|
|
|
|
// Remove link from the game texture
|
|
|
|
if (GameTex != NULL)
|
|
|
|
{
|
|
|
|
GameTex->Native = NULL;
|
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DTex :: Create
|
|
|
|
//
|
|
|
|
// Creates an IDirect3DTexture9 for the texture and copies the image data
|
|
|
|
// to it. Note that unlike FTexture, this image is row-major.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool D3DTex::Create(IDirect3DDevice9 *D3DDevice)
|
|
|
|
{
|
|
|
|
HRESULT hr;
|
|
|
|
int w, h;
|
|
|
|
|
|
|
|
if (Tex != NULL)
|
|
|
|
{
|
|
|
|
Tex->Release();
|
|
|
|
Tex = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
w = GameTex->GetWidth();
|
|
|
|
h = GameTex->GetHeight();
|
|
|
|
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
#if 1
|
2007-12-20 04:36:43 +00:00
|
|
|
hr = D3DDevice->CreateTexture(w, h, 1, 0,
|
|
|
|
GetTexFormat(), D3DPOOL_MANAGED, &Tex, NULL);
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
#else
|
|
|
|
hr = E_FAIL;
|
|
|
|
#endif
|
2007-12-28 03:30:05 +00:00
|
|
|
if (SUCCEEDED(hr))
|
|
|
|
{
|
|
|
|
TX = 1;
|
|
|
|
TY = 1;
|
|
|
|
}
|
|
|
|
else
|
2007-12-20 04:36:43 +00:00
|
|
|
{ // Try again, using power-of-2 sizes
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 1; i < w; i <<= 1) {} w = i;
|
|
|
|
for (i = 1; i < h; i <<= 1) {} h = i;
|
|
|
|
hr = D3DDevice->CreateTexture(w, h, 1, 0,
|
|
|
|
GetTexFormat(), D3DPOOL_MANAGED, &Tex, NULL);
|
|
|
|
if (FAILED(hr))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2007-12-28 03:30:05 +00:00
|
|
|
TX = GameTex->GetWidth() / float(w);
|
|
|
|
TY = GameTex->GetHeight() / float(h);
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
|
|
|
if (!Update())
|
|
|
|
{
|
|
|
|
Tex->Release();
|
|
|
|
Tex = NULL;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DTex :: Update
|
|
|
|
//
|
|
|
|
// Copies image data from the underlying FTexture to the D3D texture.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool D3DTex::Update()
|
|
|
|
{
|
|
|
|
D3DSURFACE_DESC desc;
|
|
|
|
D3DLOCKED_RECT lrect;
|
|
|
|
RECT rect;
|
|
|
|
|
|
|
|
assert(Tex != NULL);
|
|
|
|
assert(GameTex != NULL);
|
|
|
|
|
|
|
|
if (FAILED(Tex->GetLevelDesc(0, &desc)))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
rect.left = 0;
|
|
|
|
rect.top = 0;
|
|
|
|
rect.right = GameTex->GetWidth();
|
|
|
|
rect.bottom = GameTex->GetHeight();
|
|
|
|
if (FAILED(Tex->LockRect(0, &lrect, &rect, 0)))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2007-12-20 18:53:35 +00:00
|
|
|
GameTex->FillBuffer((BYTE *)lrect.pBits, lrect.Pitch, rect.bottom, ToTexFmt(desc.Format));
|
2007-12-20 04:36:43 +00:00
|
|
|
Tex->UnlockRect(0);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DTex :: GetTexFormat
|
|
|
|
//
|
|
|
|
// Returns the texture format that would best fit this texture.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DFORMAT D3DTex::GetTexFormat()
|
|
|
|
{
|
|
|
|
FTextureFormat fmt = GameTex->GetFormat();
|
|
|
|
|
|
|
|
IsGray = false;
|
|
|
|
|
|
|
|
switch (fmt)
|
|
|
|
{
|
|
|
|
case TEX_Pal: return D3DFMT_L8;
|
|
|
|
case TEX_Gray: IsGray = true; return D3DFMT_L8;
|
|
|
|
case TEX_RGB: return D3DFMT_A8R8G8B8;
|
|
|
|
case TEX_DXT1: return D3DFMT_DXT1;
|
|
|
|
case TEX_DXT2: return D3DFMT_DXT2;
|
|
|
|
case TEX_DXT3: return D3DFMT_DXT3;
|
|
|
|
case TEX_DXT4: return D3DFMT_DXT4;
|
|
|
|
case TEX_DXT5: return D3DFMT_DXT5;
|
|
|
|
default: I_FatalError ("GameTex->GetFormat() returned invalid format.");
|
|
|
|
}
|
|
|
|
return D3DFMT_L8;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DTex :: ToTexFmt
|
|
|
|
//
|
|
|
|
// Converts a D3DFORMAT constant to something the FTexture system
|
|
|
|
// understands.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
FTextureFormat D3DTex::ToTexFmt(D3DFORMAT fmt)
|
|
|
|
{
|
|
|
|
switch (fmt)
|
|
|
|
{
|
|
|
|
case D3DFMT_L8: return IsGray ? TEX_Gray : TEX_Pal;
|
|
|
|
case D3DFMT_A8R8G8B8: return TEX_RGB;
|
|
|
|
case D3DFMT_DXT1: return TEX_DXT1;
|
|
|
|
case D3DFMT_DXT2: return TEX_DXT2;
|
|
|
|
case D3DFMT_DXT3: return TEX_DXT3;
|
|
|
|
case D3DFMT_DXT4: return TEX_DXT4;
|
|
|
|
case D3DFMT_DXT5: return TEX_DXT5;
|
|
|
|
default:
|
|
|
|
assert(0); // LOL WUT?
|
|
|
|
return TEX_Pal;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DPal Constructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DPal::D3DPal(FRemapTable *remap, D3DFB *fb)
|
|
|
|
: Tex(NULL), Remap(remap)
|
|
|
|
{
|
|
|
|
int count;
|
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
// Attach to the palette list for the D3DFB
|
|
|
|
Next = fb->Palettes;
|
|
|
|
if (Next != NULL)
|
|
|
|
{
|
|
|
|
Next->Prev = &Next;
|
|
|
|
}
|
|
|
|
Prev = &fb->Palettes;
|
|
|
|
fb->Palettes = this;
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
// Palette textures must be 256 entries for Shader Model 1.4
|
|
|
|
if (fb->SM14)
|
|
|
|
{
|
|
|
|
count = 256;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int pow2count;
|
|
|
|
|
|
|
|
// Round up to the nearest power of 2.
|
|
|
|
for (pow2count = 1; pow2count < remap->NumEntries; pow2count <<= 1)
|
|
|
|
{ }
|
|
|
|
count = pow2count;
|
|
|
|
}
|
|
|
|
RoundedPaletteSize = count;
|
|
|
|
if (SUCCEEDED(fb->D3DDevice->CreateTexture(count, 1, 1, 0,
|
|
|
|
D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &Tex, NULL)))
|
|
|
|
{
|
|
|
|
if (!Update())
|
|
|
|
{
|
|
|
|
Tex->Release();
|
|
|
|
Tex = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DPal Destructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DPal::~D3DPal()
|
|
|
|
{
|
|
|
|
if (Tex != NULL)
|
|
|
|
{
|
|
|
|
Tex->Release();
|
|
|
|
Tex = NULL;
|
|
|
|
}
|
2007-12-27 04:30:12 +00:00
|
|
|
// Detach from the palette list
|
|
|
|
*Prev = Next;
|
|
|
|
if (Next != NULL)
|
|
|
|
{
|
|
|
|
Next->Prev = Prev;
|
|
|
|
}
|
|
|
|
// Remove link from the remap table
|
|
|
|
if (Remap != NULL)
|
|
|
|
{
|
|
|
|
Remap->Native = NULL;
|
|
|
|
}
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DPal :: Update
|
|
|
|
//
|
|
|
|
// Copies the palette to the texture.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool D3DPal::Update()
|
|
|
|
{
|
|
|
|
D3DLOCKED_RECT lrect;
|
|
|
|
D3DCOLOR *buff;
|
|
|
|
const PalEntry *pal;
|
|
|
|
|
|
|
|
assert(Tex != NULL);
|
|
|
|
|
|
|
|
if (FAILED(Tex->LockRect(0, &lrect, NULL, 0)))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
buff = (D3DCOLOR *)lrect.pBits;
|
|
|
|
pal = Remap->Palette;
|
|
|
|
|
|
|
|
// Should I allow the source palette to specify alpha values?
|
2007-12-27 04:30:12 +00:00
|
|
|
buff[0] = D3DCOLOR_ARGB(0, pal[0].r, pal[0].g, pal[0].b);
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
for (int i = 1; i < Remap->NumEntries; ++i)
|
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
buff[i] = D3DCOLOR_XRGB(pal[i].r, pal[i].g, pal[i].b);
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
}
|
|
|
|
Tex->UnlockRect(0);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2007-12-20 04:36:43 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Begin2D
|
|
|
|
//
|
|
|
|
// Begins 2D mode drawing operations. In particular, DrawTexture is
|
|
|
|
// rerouted to use Direct3D instead of the software renderer.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2008-01-02 05:21:48 +00:00
|
|
|
bool D3DFB::Begin2D(bool copy3d)
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
if (!test2d)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
if (In2D)
|
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
return true;
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
2008-01-02 05:21:48 +00:00
|
|
|
In2D = 2 - copy3d;
|
2007-12-20 04:36:43 +00:00
|
|
|
Update();
|
2008-01-02 05:21:48 +00:00
|
|
|
In2D = 3;
|
2007-12-20 04:36:43 +00:00
|
|
|
|
2007-12-27 04:30:12 +00:00
|
|
|
return true;
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: CreateTexture
|
|
|
|
//
|
|
|
|
// Returns a native texture that wraps a FTexture.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-12-20 04:36:43 +00:00
|
|
|
FNativeTexture *D3DFB::CreateTexture(FTexture *gametex)
|
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
D3DTex *tex = new D3DTex(gametex, this);
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
if (tex->Tex == NULL)
|
|
|
|
{
|
|
|
|
delete tex;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return tex;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: CreatePalette
|
|
|
|
//
|
|
|
|
// Returns a native texture that contains a palette.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
FNativeTexture *D3DFB::CreatePalette(FRemapTable *remap)
|
|
|
|
{
|
|
|
|
D3DPal *tex = new D3DPal(remap, this);
|
|
|
|
if (tex->Tex == NULL)
|
|
|
|
{
|
|
|
|
delete tex;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return tex;
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
2007-12-22 04:52:51 +00:00
|
|
|
//
|
|
|
|
// D3DFB :: Clear
|
|
|
|
//
|
|
|
|
// Fills the specified region with a color.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
void D3DFB::Clear (int left, int top, int right, int bottom, int palcolor, uint32 color)
|
2007-12-22 04:52:51 +00:00
|
|
|
{
|
|
|
|
if (In2D < 2)
|
|
|
|
{
|
|
|
|
Super::Clear(left, top, right, bottom, palcolor, color);
|
|
|
|
return;
|
|
|
|
}
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
if (!InScene)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2007-12-22 04:52:51 +00:00
|
|
|
if (palcolor >= 0)
|
|
|
|
{
|
|
|
|
color = GPalette.BaseColors[palcolor];
|
|
|
|
}
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
else if (APART(color) < 255)
|
|
|
|
{
|
|
|
|
Dim(color, APART(color)/255.f, left, top, right - left, bottom - top);
|
|
|
|
return;
|
|
|
|
}
|
2008-01-02 05:21:48 +00:00
|
|
|
int offs = GatheringWipeScreen ? 0 : LBOffsetI;
|
|
|
|
D3DRECT rect = { left, top + offs, right, bottom + offs };
|
2007-12-22 04:52:51 +00:00
|
|
|
D3DDevice->Clear(1, &rect, D3DCLEAR_TARGET, color | 0xFF000000, 1.f, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Dim
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
void D3DFB::Dim (PalEntry color, float amount, int x1, int y1, int w, int h)
|
2007-12-22 04:52:51 +00:00
|
|
|
{
|
|
|
|
if (amount <= 0)
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
{
|
2007-12-22 04:52:51 +00:00
|
|
|
return;
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
}
|
2007-12-22 04:52:51 +00:00
|
|
|
if (In2D < 2)
|
|
|
|
{
|
|
|
|
Super::Dim(color, amount, x1, y1, w, h);
|
|
|
|
return;
|
|
|
|
}
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
if (!InScene)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2007-12-22 04:52:51 +00:00
|
|
|
if (amount >= 1)
|
|
|
|
{
|
|
|
|
D3DRECT rect = { x1, y1, x1 + w, y1 + h };
|
|
|
|
D3DDevice->Clear(1, &rect, D3DCLEAR_TARGET, color | 0xFF000000, 1.f, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-12-28 03:30:05 +00:00
|
|
|
float x = float(x1) - 0.5f;
|
2008-01-02 05:21:48 +00:00
|
|
|
float y = float(y1) - 0.5f + (GatheringWipeScreen ? 0 : LBOffset);
|
2008-01-04 05:22:30 +00:00
|
|
|
D3DCOLOR d3dcolor = color | (int(amount * 255) << 24);
|
2007-12-22 04:52:51 +00:00
|
|
|
FBVERTEX verts[4] =
|
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
{ x, y, 0, 1, d3dcolor },
|
|
|
|
{ x+w, y, 0, 1, d3dcolor },
|
|
|
|
{ x+w, y+h, 0, 1, d3dcolor },
|
|
|
|
{ x, y+h, 0, 1, d3dcolor }
|
2007-12-22 04:52:51 +00:00
|
|
|
};
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
SetAlphaBlend(TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA);
|
2008-01-04 05:22:30 +00:00
|
|
|
SetPixelShader(ColorOnlyShader);
|
2007-12-22 04:52:51 +00:00
|
|
|
D3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, &verts, sizeof(FBVERTEX));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-04 05:22:30 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: BeginLineDrawing
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::BeginLineDrawing()
|
|
|
|
{
|
|
|
|
if (In2D < 2 || !InScene || LineBatchPos >= 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
LineBuffer->Lock(0, 0, (void **)&LineData, D3DLOCK_DISCARD);
|
|
|
|
LineBatchPos = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: EndLineDrawing
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::EndLineDrawing()
|
|
|
|
{
|
|
|
|
if (In2D < 2 || !InScene || LineBatchPos < 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
LineBuffer->Unlock();
|
|
|
|
if (LineBatchPos > 0)
|
|
|
|
{
|
|
|
|
SetPixelShader(ColorOnlyShader);
|
|
|
|
SetAlphaBlend(TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA);
|
|
|
|
D3DDevice->SetStreamSource(0, LineBuffer, 0, sizeof(FBVERTEX));
|
|
|
|
D3DDevice->DrawPrimitive(D3DPT_LINELIST, 0, LineBatchPos / 2);
|
|
|
|
}
|
|
|
|
LineBatchPos = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: DrawLine
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::DrawLine(int x0, int y0, int x1, int y1, int palcolor, uint32 color)
|
|
|
|
{
|
|
|
|
if (In2D < 2)
|
|
|
|
{
|
|
|
|
Super::DrawLine(x0, y0, x1, y1, palcolor, color);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!InScene)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (LineBatchPos == NUM_LINE_VERTS)
|
|
|
|
{ // flush the buffer and refill it
|
|
|
|
EndLineDrawing();
|
|
|
|
BeginLineDrawing();
|
|
|
|
}
|
|
|
|
if (LineBatchPos >= 0)
|
|
|
|
{ // Batched drawing: Add the endpoints to the vertex buffer.
|
|
|
|
LineData[LineBatchPos].x = float(x0);
|
|
|
|
LineData[LineBatchPos].y = float(y0) + LBOffset;
|
|
|
|
LineData[LineBatchPos].z = 0;
|
|
|
|
LineData[LineBatchPos].rhw = 1;
|
|
|
|
LineData[LineBatchPos].color0 = color;
|
|
|
|
LineData[LineBatchPos].color1 = 0;
|
|
|
|
LineData[LineBatchPos].tu = 0;
|
|
|
|
LineData[LineBatchPos].tv = 0;
|
|
|
|
LineData[LineBatchPos+1].x = float(x1);
|
|
|
|
LineData[LineBatchPos+1].y = float(y1) + LBOffset;
|
|
|
|
LineData[LineBatchPos+1].z = 0;
|
|
|
|
LineData[LineBatchPos+1].rhw = 1;
|
|
|
|
LineData[LineBatchPos+1].color0 = color;
|
|
|
|
LineData[LineBatchPos+1].color1 = 0;
|
|
|
|
LineData[LineBatchPos+1].tu = 0;
|
|
|
|
LineData[LineBatchPos+1].tv = 0;
|
|
|
|
LineBatchPos += 2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // Unbatched drawing: Draw it right now.
|
|
|
|
FBVERTEX endpts[2] =
|
|
|
|
{
|
|
|
|
{ float(x0), float(y0), 0, 1, color },
|
|
|
|
{ float(x1), float(y1), 0, 1, color }
|
|
|
|
};
|
|
|
|
SetPixelShader(ColorOnlyShader);
|
|
|
|
SetAlphaBlend(TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA);
|
|
|
|
D3DDevice->DrawPrimitiveUP(D3DPT_LINELIST, 1, endpts, sizeof(FBVERTEX));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: DrawPixel
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::DrawPixel(int x, int y, int palcolor, uint32 color)
|
|
|
|
{
|
|
|
|
if (In2D < 2)
|
|
|
|
{
|
|
|
|
Super::DrawPixel(x, y, palcolor, color);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!InScene)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
FBVERTEX pt =
|
|
|
|
{
|
|
|
|
float(x), float(y), 0, 1, color
|
|
|
|
};
|
|
|
|
SetPixelShader(ColorOnlyShader);
|
|
|
|
SetAlphaBlend(TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA);
|
|
|
|
D3DDevice->DrawPrimitiveUP(D3DPT_POINTLIST, 1, &pt, sizeof(FBVERTEX));
|
|
|
|
}
|
|
|
|
|
2007-12-22 04:52:51 +00:00
|
|
|
//==========================================================================
|
2007-12-20 04:36:43 +00:00
|
|
|
//
|
2007-12-22 04:00:25 +00:00
|
|
|
// D3DFB :: DrawTextureV
|
2007-12-20 04:36:43 +00:00
|
|
|
//
|
|
|
|
// If not in 2D mode, just call the normal software version.
|
|
|
|
// If in 2D mode, then use Direct3D calls to perform the drawing.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-12-22 04:00:25 +00:00
|
|
|
void STACK_ARGS D3DFB::DrawTextureV (FTexture *img, int x, int y, uint32 tags_first, va_list tags)
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
|
|
|
if (In2D < 2)
|
|
|
|
{
|
2007-12-22 04:00:25 +00:00
|
|
|
Super::DrawTextureV(img, x, y, tags_first, tags);
|
2007-12-20 04:36:43 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
DrawParms parms;
|
|
|
|
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
if (!InScene || !ParseDrawTextureTags(img, x, y, tags_first, tags, &parms, true))
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
D3DTex *tex = static_cast<D3DTex *>(img->GetNative());
|
|
|
|
|
|
|
|
if (tex == NULL)
|
|
|
|
{
|
|
|
|
assert(tex != NULL);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
float xscale = float(parms.destwidth) / parms.texwidth / 65536.f;
|
|
|
|
float yscale = float(parms.destheight) / parms.texheight / 65536.f;
|
|
|
|
float x0 = float(parms.x) / 65536.f - float(parms.left) * xscale;
|
|
|
|
float y0 = float(parms.y) / 65536.f - float(parms.top) * yscale;
|
|
|
|
float x1 = x0 + float(parms.destwidth) / 65536.f;
|
|
|
|
float y1 = y0 + float(parms.destheight) / 65536.f;
|
|
|
|
float u0 = 0.f;
|
|
|
|
float v0 = 0.f;
|
2007-12-28 03:30:05 +00:00
|
|
|
float u1 = tex->TX;
|
|
|
|
float v1 = tex->TY;
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
float uscale = 1.f / (parms.texwidth / u1);
|
|
|
|
float vscale = 1.f / (parms.texheight / v1) / yscale;
|
2007-12-20 04:36:43 +00:00
|
|
|
|
|
|
|
if (y0 < parms.uclip)
|
|
|
|
{
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
v0 += (float(parms.uclip) - y0) * vscale;
|
2007-12-20 04:36:43 +00:00
|
|
|
y0 = float(parms.uclip);
|
|
|
|
}
|
|
|
|
if (y1 > parms.dclip)
|
|
|
|
{
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
v1 -= (y1 - float(parms.dclip)) * vscale;
|
2007-12-20 04:36:43 +00:00
|
|
|
y1 = float(parms.dclip);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (parms.flipX)
|
|
|
|
{
|
|
|
|
swap(u0, u1);
|
|
|
|
}
|
|
|
|
if (parms.windowleft > 0 || parms.windowright < parms.texwidth)
|
|
|
|
{
|
|
|
|
x0 += parms.windowleft * xscale;
|
|
|
|
u0 += parms.windowleft * uscale;
|
|
|
|
x1 -= (parms.texwidth - parms.windowright) * xscale;
|
|
|
|
u1 -= (parms.texwidth - parms.windowright) * uscale;
|
|
|
|
}
|
|
|
|
if (x0 < parms.lclip)
|
|
|
|
{
|
|
|
|
u0 += float(parms.lclip - x0) * uscale / xscale;
|
|
|
|
x0 = float(parms.lclip);
|
|
|
|
}
|
|
|
|
if (x1 > parms.rclip)
|
|
|
|
{
|
|
|
|
u1 -= float(x1 - parms.rclip) * uscale / xscale;
|
|
|
|
x1 = float(parms.rclip);
|
|
|
|
}
|
|
|
|
|
2008-01-02 05:21:48 +00:00
|
|
|
float yoffs = GatheringWipeScreen ? 0.5f : 0.5f - LBOffset;
|
2007-12-20 04:36:43 +00:00
|
|
|
x0 -= 0.5f;
|
2008-01-02 05:21:48 +00:00
|
|
|
y0 -= yoffs;
|
2007-12-20 04:36:43 +00:00
|
|
|
x1 -= 0.5f;
|
2008-01-02 05:21:48 +00:00
|
|
|
y1 -= yoffs;
|
2007-12-20 04:36:43 +00:00
|
|
|
|
2008-01-04 05:22:30 +00:00
|
|
|
D3DCOLOR color0, color1;
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
parms.bilinear = false;
|
2008-01-04 05:22:30 +00:00
|
|
|
if (!SetStyle(tex, parms, color0, color1))
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-01-04 05:22:30 +00:00
|
|
|
FBVERTEX verts[4] =
|
|
|
|
{
|
|
|
|
{ x0, y0, 0, 1, color0, color1, u0, v0 },
|
|
|
|
{ x1, y0, 0, 1, color0, color1, u1, v0 },
|
|
|
|
{ x1, y1, 0, 1, color0, color1, u1, v1 },
|
|
|
|
{ x0, y1, 0, 1, color0, color1, u0, v1 }
|
|
|
|
};
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
SetTexture(0, tex->Tex);
|
2007-12-20 04:36:43 +00:00
|
|
|
D3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, &verts, sizeof(FBVERTEX));
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: SetStyle
|
|
|
|
//
|
|
|
|
// Patterned after R_SetPatchStyle.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2008-01-04 05:22:30 +00:00
|
|
|
bool D3DFB::SetStyle(D3DTex *tex, DrawParms &parms, D3DCOLOR &color0, D3DCOLOR &color1)
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
D3DFORMAT fmt = tex->GetTexFormat();
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
ERenderStyle style = parms.style;
|
2007-12-20 04:36:43 +00:00
|
|
|
D3DBLEND fglevel, bglevel;
|
|
|
|
float alpha;
|
|
|
|
bool stencilling;
|
|
|
|
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
alpha = clamp<fixed_t> (parms.alpha, 0, FRACUNIT) / 65536.f;
|
2007-12-20 04:36:43 +00:00
|
|
|
|
|
|
|
if (style == STYLE_OptFuzzy)
|
|
|
|
{
|
|
|
|
style = STYLE_Translucent;
|
|
|
|
}
|
|
|
|
else if (style == STYLE_SoulTrans)
|
|
|
|
{
|
|
|
|
style = STYLE_Translucent;
|
|
|
|
alpha = transsouls;
|
|
|
|
}
|
|
|
|
|
|
|
|
// FIXME: STYLE_Fuzzy is not written
|
|
|
|
if (style == STYLE_Fuzzy)
|
|
|
|
{
|
|
|
|
style = STYLE_Translucent;
|
|
|
|
alpha = transsouls;
|
|
|
|
}
|
|
|
|
|
|
|
|
stencilling = false;
|
|
|
|
|
|
|
|
switch (style)
|
|
|
|
{
|
|
|
|
// Special modes
|
|
|
|
case STYLE_Shaded:
|
|
|
|
if (alpha > 0)
|
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
color0 = 0;
|
|
|
|
color1 = parms.fillcolor | (D3DCOLOR(alpha * 255) << 24);
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetPaletteTexture(ShadedPaletteTexture, 256, parms.bilinear);
|
|
|
|
if (parms.bilinear)
|
|
|
|
{
|
|
|
|
SetPalTexBilinearConstants(tex);
|
|
|
|
}
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
SetAlphaBlend(TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA);
|
2007-12-20 04:36:43 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Standard modes
|
|
|
|
case STYLE_Stencil:
|
|
|
|
stencilling = true;
|
|
|
|
case STYLE_Normal:
|
|
|
|
fglevel = D3DBLEND_SRCALPHA;
|
|
|
|
bglevel = D3DBLEND_INVSRCALPHA;
|
|
|
|
alpha = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case STYLE_TranslucentStencil:
|
|
|
|
stencilling = true;
|
|
|
|
case STYLE_Translucent:
|
|
|
|
fglevel = D3DBLEND_SRCALPHA;
|
|
|
|
bglevel = D3DBLEND_INVSRCALPHA;
|
|
|
|
if (alpha == 0)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (alpha == 1 && style == STYLE_Translucent)
|
|
|
|
{
|
|
|
|
style = STYLE_Normal;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case STYLE_Add:
|
|
|
|
fglevel = D3DBLEND_SRCALPHA;
|
|
|
|
bglevel = D3DBLEND_ONE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Masking can only be turned off for STYLE_Normal, because it requires
|
|
|
|
// turning off the alpha blend.
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
if (!parms.masked && style == STYLE_Normal)
|
2007-12-20 04:36:43 +00:00
|
|
|
{
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
SetAlphaBlend(FALSE);
|
2008-01-04 05:22:30 +00:00
|
|
|
SetColorOverlay(parms.colorOverlay, 1, color0, color1);
|
2007-12-27 04:30:12 +00:00
|
|
|
if (fmt == D3DFMT_L8 && !tex->IsGray)
|
|
|
|
{
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetPaletteTexture(PaletteTexture, 256, parms.bilinear);
|
|
|
|
if (parms.bilinear)
|
|
|
|
{
|
|
|
|
SetPalTexBilinearConstants(tex);
|
|
|
|
}
|
2007-12-27 04:30:12 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SetPixelShader(PlainShader);
|
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
SetAlphaBlend(TRUE, fglevel, bglevel);
|
2007-12-20 04:36:43 +00:00
|
|
|
|
|
|
|
if (!stencilling)
|
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
if (fmt == D3DFMT_L8)
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
if (parms.remap != NULL)
|
|
|
|
{
|
|
|
|
D3DPal *pal = reinterpret_cast<D3DPal *>(parms.remap->GetNative());
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetPaletteTexture(pal->Tex, pal->RoundedPaletteSize, parms.bilinear);
|
|
|
|
if (parms.bilinear)
|
|
|
|
{
|
|
|
|
SetPalTexBilinearConstants(tex);
|
|
|
|
}
|
2007-12-27 04:30:12 +00:00
|
|
|
}
|
|
|
|
else if (tex->IsGray)
|
|
|
|
{
|
|
|
|
SetPixelShader(PlainShader);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetPaletteTexture(PaletteTexture, 256, parms.bilinear);
|
|
|
|
if (parms.bilinear)
|
|
|
|
{
|
|
|
|
SetPalTexBilinearConstants(tex);
|
|
|
|
}
|
2007-12-27 04:30:12 +00:00
|
|
|
}
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
SetPixelShader(PlainShader);
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
}
|
2008-01-04 05:22:30 +00:00
|
|
|
SetColorOverlay(parms.colorOverlay, alpha, color0, color1);
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
color0 = 0;
|
|
|
|
color1 = parms.fillcolor | (D3DCOLOR(alpha * 255) << 24);
|
2007-12-27 04:30:12 +00:00
|
|
|
if (fmt == D3DFMT_L8)
|
|
|
|
{
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
// Doesn't seem to be much point in allowing bilinear with a stencil
|
|
|
|
SetPaletteTexture(StencilPaletteTexture, 256, false);
|
2007-12-27 04:30:12 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SetPixelShader(PlainStencilShader);
|
|
|
|
}
|
2007-12-20 04:36:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
}
|
|
|
|
|
2008-01-04 05:22:30 +00:00
|
|
|
void D3DFB::SetColorOverlay(DWORD color, float alpha, D3DCOLOR &color0, D3DCOLOR &color1)
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
{
|
|
|
|
if (APART(color) != 0)
|
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
int a = APART(color) * 256 / 255;
|
|
|
|
color0 = D3DCOLOR_RGBA(
|
|
|
|
(RPART(color) * a) >> 8,
|
|
|
|
(GPART(color) * a) >> 8,
|
|
|
|
(BPART(color) * a) >> 8,
|
|
|
|
0);
|
|
|
|
a = 256 - a;
|
|
|
|
color1 = D3DCOLOR_RGBA(a, a, a, int(alpha * 255));
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-01-04 05:22:30 +00:00
|
|
|
color0 = 0;
|
|
|
|
color1 = D3DCOLOR_COLORVALUE(1, 1, 1, alpha);
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::SetAlphaBlend(BOOL enabled, D3DBLEND srcblend, D3DBLEND destblend)
|
|
|
|
{
|
|
|
|
if (!enabled)
|
|
|
|
{ // Disable alpha blend
|
|
|
|
if (AlphaBlendEnabled)
|
|
|
|
{
|
|
|
|
AlphaBlendEnabled = FALSE;
|
|
|
|
D3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // Enable alpha blend
|
|
|
|
assert(srcblend != 0);
|
|
|
|
assert(destblend != 0);
|
|
|
|
|
|
|
|
if (!AlphaBlendEnabled)
|
|
|
|
{
|
|
|
|
AlphaBlendEnabled = TRUE;
|
|
|
|
D3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
|
|
|
|
}
|
|
|
|
if (AlphaSrcBlend != srcblend)
|
|
|
|
{
|
|
|
|
AlphaSrcBlend = srcblend;
|
|
|
|
D3DDevice->SetRenderState(D3DRS_SRCBLEND, srcblend);
|
|
|
|
}
|
|
|
|
if (AlphaDestBlend != destblend)
|
|
|
|
{
|
|
|
|
AlphaDestBlend = destblend;
|
|
|
|
D3DDevice->SetRenderState(D3DRS_DESTBLEND, destblend);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::SetConstant(int cnum, float r, float g, float b, float a)
|
|
|
|
{
|
|
|
|
if (Constant[cnum][0] != r ||
|
|
|
|
Constant[cnum][1] != g ||
|
|
|
|
Constant[cnum][2] != b ||
|
|
|
|
Constant[cnum][3] != a)
|
|
|
|
{
|
|
|
|
Constant[cnum][0] = r;
|
|
|
|
Constant[cnum][1] = g;
|
|
|
|
Constant[cnum][2] = b;
|
|
|
|
Constant[cnum][3] = a;
|
|
|
|
D3DDevice->SetPixelShaderConstantF(cnum, Constant[cnum], 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::SetPixelShader(IDirect3DPixelShader9 *shader)
|
|
|
|
{
|
|
|
|
if (CurPixelShader != shader)
|
|
|
|
{
|
|
|
|
CurPixelShader = shader;
|
|
|
|
D3DDevice->SetPixelShader(shader);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::SetTexture(int tnum, IDirect3DTexture9 *texture)
|
|
|
|
{
|
|
|
|
if (Texture[tnum] != texture)
|
|
|
|
{
|
|
|
|
Texture[tnum] = texture;
|
|
|
|
D3DDevice->SetTexture(tnum, texture);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
void D3DFB::SetPaletteTexture(IDirect3DTexture9 *texture, int count, INTBOOL bilinear)
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
{
|
2007-12-27 04:30:12 +00:00
|
|
|
if (count == 256 || SM14)
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
{
|
|
|
|
// Shader Model 1.4 only uses 256-color palettes.
|
|
|
|
SetConstant(2, 255 / 256.f, 0.5f / 256.f, 0, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// The pixel shader receives color indexes in the range [0.0,1.0].
|
|
|
|
// The palette texture is also addressed in the range [0.0,1.0],
|
|
|
|
// HOWEVER the coordinate 1.0 is the right edge of the texture and
|
|
|
|
// not actually the texture itself. We need to scale and shift
|
|
|
|
// the palette indexes so they lie exactly in the center of each
|
|
|
|
// texel. For a normal palette with 256 entries, that means the
|
|
|
|
// range we use should be [0.5,255.5], adjusted so the coordinate
|
|
|
|
// is still with [0.0,1.0].
|
|
|
|
//
|
|
|
|
// The constant register c2 is used to hold the multiplier in the
|
|
|
|
// x part and the adder in the y part.
|
|
|
|
float fcount = 1 / float(count);
|
|
|
|
SetConstant(2, 255 * fcount, 0.5f * fcount, 0, 0);
|
|
|
|
}
|
|
|
|
SetTexture(1, texture);
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
SetPixelShader(!bilinear ? PalTexShader : PalTexBilinearShader);
|
|
|
|
}
|
|
|
|
|
|
|
|
void D3DFB::SetPalTexBilinearConstants(D3DTex *tex)
|
|
|
|
{
|
|
|
|
float con[8];
|
|
|
|
|
|
|
|
// Don't bother doing anything if the constants won't be used.
|
|
|
|
if (PalTexShader == PalTexBilinearShader)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
con[0] = tex->GameTex->GetWidth() / tex->TX;
|
|
|
|
con[1] = tex->GameTex->GetHeight() / tex->TY;
|
|
|
|
con[2] = 0;
|
|
|
|
con[3] = 1 / con[0];
|
|
|
|
con[4] = 0;
|
|
|
|
con[5] = 1 / con[1];
|
|
|
|
con[6] = con[5];
|
|
|
|
con[7] = con[3];
|
|
|
|
|
|
|
|
D3DDevice->SetPixelShaderConstantF(3, con, 2);
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
}
|