ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PixelShaderGen: Fix a bug introduced in revision 9adc119e3c. 

D3D11: Fix shader constant mapping.
This commit is contained in:
NeoBrainX 2012-02-21 12:51:41 +01:00
parent 9adc119e3c
commit 3a9fed0ba2
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/LinearDiskCache.h
View File

@ -24,7 +24,7 @@
// Increment this every time you change shader generation code. // Increment this every time you change shader generation code.
enum enum
{ {
LINEAR_DISKCACHE_VER = 6971 LINEAR_DISKCACHE_VER = 6972
}; };
// On disk format: // On disk format:

5
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
View File

@ -560,7 +560,10 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
WRITE(p, "uniform float4 "I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS); WRITE(p, "uniform float4 "I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS);
WRITE(p, "uniform float4 "I_ALPHA"[1] : register(c%d);\n", C_ALPHA); WRITE(p, "uniform float4 "I_ALPHA"[1] : register(c%d);\n", C_ALPHA);
WRITE(p, "uniform float4 "I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS); WRITE(p, "uniform float4 "I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS);
WRITE(p, "uniform float4 "I_VTEXSCALE"[8] : register(c%d);\n", C_VTEXSCALE); if (ApiType & API_D3D9)
{
WRITE(p, "uniform float4 "I_VTEXSCALE"[4] : register(c%d);\n", C_VTEXSCALE);
}
WRITE(p, "uniform float4 "I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS); WRITE(p, "uniform float4 "I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS);
WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE); WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE);
WRITE(p, "uniform float4 "I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX); WRITE(p, "uniform float4 "I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX);

28
Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
View File

@ -552,20 +552,22 @@ static const unsigned int ps_constant_offset_table[] = {
16, 20, 24, 28, // C_KCOLORS, 16 16, 20, 24, 28, // C_KCOLORS, 16
32, // C_ALPHA, 4 32, // C_ALPHA, 4
36, 40, 44, 48, 52, 56, 60, 64, // C_TEXDIMS, 32 36, 40, 44, 48, 52, 56, 60, 64, // C_TEXDIMS, 32
68, 72, // C_ZBIAS, 8 68, 72, 76, 80, // C_VTEXSCALE, 16 (unused)
76, 80, // C_INDTEXSCALE, 8 84, 88, // C_ZBIAS, 8
84, 88, 92, 96, 100, 104, // C_INDTEXMTX, 24 92, 96, // C_INDTEXSCALE, 8
108, 112, 116, // C_FOG, 12 100, 104, 108, 112, 116, 120, // C_INDTEXMTX, 24
120, 124, 128, 132, 136, // C_PLIGHTS0, 20 124, 128, 132, // C_FOG, 12
140, 144, 148, 152, 156, // C_PLIGHTS1, 20 136, 140, 144, 148, 152, // C_PLIGHTS0, 20
160, 164, 168, 172, 176, // C_PLIGHTS2, 20 156, 160, 164, 168, 172, // C_PLIGHTS1, 20
180, 184, 188, 192, 196, // C_PLIGHTS3, 20 176, 180, 184, 188, 192, // C_PLIGHTS2, 20
200, 204, 208, 212, 216, // C_PLIGHTS4, 20 196, 200, 204, 208, 212, // C_PLIGHTS3, 20
220, 224, 228, 232, 236, // C_PLIGHTS5, 20 216, 220, 224, 228, 232, // C_PLIGHTS4, 20
240, 244, 248, 252, 256, // C_PLIGHTS6, 20 236, 240, 244, 248, 252, // C_PLIGHTS5, 20
260, 264, 268, 272, 276, // C_PLIGHTS7, 20 256, 260, 264, 268, 272, // C_PLIGHTS6, 20
280, 284, 288, 292 // C_PMATERIALS, 16 276, 280, 284, 288, 292, // C_PLIGHTS7, 20
296, 300, 304, 308, // C_PMATERIALS, 16
}; };
void Renderer::SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4) void Renderer::SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
{ {
psconstants[ps_constant_offset_table[const_number] ] = f1; psconstants[ps_constant_offset_table[const_number] ] = f1;