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

this probably doesn't fix anything noticeable, but, it seems like a bug that C_COLORMATRIX+4 overlapped with C_PLIGHTS 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6620 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nitsuja- 2010-12-19 21:09:29 +00:00
parent 60d2d42525
commit 6492b84ca5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
// shader cache for every revision, graphics-related or not, which is simply annoying. // shader cache for every revision, graphics-related or not, which is simply annoying.
enum enum
{ {
LINEAR_DISKCACHE_VER = 6618 LINEAR_DISKCACHE_VER = 6620
}; };
// On disk format: // On disk format:

2
Source/Core/VideoCommon/Src/PixelShaderGen.h
View File

@ -40,7 +40,7 @@
#define C_INDTEXMTX (C_INDTEXSCALE + 2) #define C_INDTEXMTX (C_INDTEXSCALE + 2)
#define C_FOG (C_INDTEXMTX + 6) #define C_FOG (C_INDTEXMTX + 6)
#define C_COLORMATRIX (C_FOG + 2) #define C_COLORMATRIX (C_FOG + 2)
#define C_PLIGHTS (C_COLORMATRIX + 4) #define C_PLIGHTS (C_COLORMATRIX + 5)
#define C_PMATERIALS (C_PLIGHTS + 40) #define C_PMATERIALS (C_PLIGHTS + 40)
#define C_PENVCONST_END (C_PMATERIALS + 4) #define C_PENVCONST_END (C_PMATERIALS + 4)
#define PIXELSHADERUID_MAX_VALUES (5 + 32 + 6 + 11 + 2) #define PIXELSHADERUID_MAX_VALUES (5 + 32 + 6 + 11 + 2)

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

@ -214,16 +214,16 @@ unsigned int ps_constant_offset_table[] = {
76, 80, // C_INDTEXSCALE, 8 76, 80, // C_INDTEXSCALE, 8
84, 88, 92, 96, 100, 104, // C_INDTEXMTX, 24 84, 88, 92, 96, 100, 104, // C_INDTEXMTX, 24
108, 112, // C_FOG, 8 108, 112, // C_FOG, 8
116, 120, 124 ,128, // C_COLORMATRIX, 16 116, 120, 124, 128, 132, // C_COLORMATRIX, 20
132, 136, 140, 144, 148, // C_PLIGHTS0, 20 136, 140, 144, 148, 152, // C_PLIGHTS0, 20
152, 156, 160, 164, 168, // C_PLIGHTS1, 20 156, 160, 164, 168, 172, // C_PLIGHTS1, 20
172, 176, 180, 184, 188, // C_PLIGHTS2, 20 176, 180, 184, 188, 192, // C_PLIGHTS2, 20
192, 196, 200, 204, 208, // C_PLIGHTS3, 20 196, 200, 204, 208, 212, // C_PLIGHTS3, 20
212, 216, 220, 224, 228, // C_PLIGHTS4, 20 216, 220, 224, 228, 232, // C_PLIGHTS4, 20
232, 236, 240, 244, 248, // C_PLIGHTS5, 20 236, 240, 244, 248, 252, // C_PLIGHTS5, 20
252, 256, 260, 264, 268, // C_PLIGHTS6, 20 256, 260, 264, 268, 272, // C_PLIGHTS6, 20
272, 276, 280, 284, 288, // C_PLIGHTS7, 20 276, 280, 284, 288, 292, // C_PLIGHTS7, 20
292, 296, 300, 304, // C_PMATERIALS, 16 296, 300, 304, 308, // C_PMATERIALS, 16
}; };
void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4) void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
{ {