fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed palette in DX9 mode

Browse Source
This commit is contained in:
NovaRain
2020-02-01 14:07:38 +08:00
parent 1ac911a7c9
commit c61fe596b1
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/FalloutEngine/EngineUtils.cpp
+1
View File
@@ -204,6 +204,7 @@ enum WinNameType {
Character = 5,
Skilldex = 6,
EscMenu = 7, // escape menu
// Automap = 8 // for this window there is no global variable
};
fo::Window* GetWindow(long winType) {
sfall/Modules/Graphics.cpp
+10 -8
View File
@@ -103,7 +103,7 @@ static const char* gpuEffect =
"texture head;"
"texture highlight;"
"sampler s0 = sampler_state { texture=<image>; };"
"sampler s1 = sampler_state { texture=<palette>; };"
"sampler s1 = sampler_state { texture=<palette>; minFilter=none; magFilter=none; addressU=clamp; addressV=clamp; };"
"sampler s2 = sampler_state { texture=<head>; minFilter=linear; magFilter=linear; addressU=clamp; addressV=clamp; };"
"sampler s3 = sampler_state { texture=<highlight>; minFilter=linear; magFilter=linear; addressU=clamp; addressV=clamp; };"
"float2 size;"
@@ -137,7 +137,7 @@ static const char* gpuEffect =
"float4 P0( in float2 Tex : TEXCOORD0 ) : COLOR0 {"
"float3 result = tex1D(s1, tex2D(s0, Tex).a);"
"return float4(result.b, result.g, result.r, 1);"
"return float4(result.b, result.g, result.r, 1);" // GPU swap R <> B
"}"
"technique T0"
@@ -238,12 +238,14 @@ static void ResetDevice(bool createNew) {
software = true;
d3d9->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE, &params, &d3d9Device);
}
// Use: 0 - only CPU, 1 - force GPU, 2 - Auto mode (GPU or swith to CPU)
if (Graphics::GPUBlt == 2) {
D3DCAPS9 caps;
d3d9Device->GetDeviceCaps(&caps);
ShaderVersion = ((caps.PixelShaderVersion & 0x0000FF00) >> 8) * 10 + (caps.PixelShaderVersion & 0xFF);
if (Graphics::GPUBlt == 2 && ShaderVersion < 20) Graphics::GPUBlt = 0;
if (ShaderVersion < 20) Graphics::GPUBlt = 0;
}
if (Graphics::GPUBlt) {
D3DXCreateEffect(d3d9Device, gpuEffect, strlen(gpuEffect), 0, 0, 0, 0, &gpuBltEffect, 0);
gpuBltBuf = gpuBltEffect->GetParameterByName(0, "image");
@@ -403,14 +405,15 @@ void RefreshGraphics() {
d3d9Device->SetStreamSource(0, vBuffer, 0, sizeof(VertexFormat));
d3d9Device->SetRenderTarget(0, sSurf1);
if (Graphics::GPUBlt && ScriptShaders::Count()) {
UINT unused;
if (Graphics::GPUBlt && ScriptShaders::Count()) {
gpuBltEffect->Begin(&unused, 0);
gpuBltEffect->BeginPass(0);
d3d9Device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
gpuBltEffect->EndPass();
gpuBltEffect->End();
d3d9Device->StretchRect(sSurf1, 0, sSurf2, 0, D3DTEXF_NONE);
d3d9Device->StretchRect(sSurf1, 0, sSurf2, 0, D3DTEXF_NONE); // copy: sSurf1 to sSurf2
d3d9Device->SetTexture(0, sTex2);
} else {
d3d9Device->SetTexture(0, Tex);
@@ -420,7 +423,6 @@ void RefreshGraphics() {
d3d9Device->SetStreamSource(0, vBuffer2, 0, sizeof(VertexFormat));
d3d9Device->SetRenderTarget(0, backbuffer);
if (Graphics::GPUBlt && !ScriptShaders::Count()) {
UINT unused;
gpuBltEffect->Begin(&unused, 0);
gpuBltEffect->BeginPass(0);
}