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

glsl: fix bad copy/past 

Thanks  @turtleli
This commit is contained in:
Gregory Hainaut 2015-06-07 10:02:39 +02:00
parent 880900d306
commit 1bd15a0d2b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/shaders/GSdx.fx
View File

@ -49,10 +49,10 @@
#define SamplerState sampler2D #define SamplerState sampler2D
#define matrix4(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3) \ #define matrix4(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3) \
mat4(a0, b0, c0, d0, a1, b1, c1, d1, a2, b2, c2, d2, a3, b3, c3, d3); mat4(a0, b0, c0, d0, a1, b1, c1, d1, a2, b2, c2, d2, a3, b3, c3, d3);
#define matrix3(a0, a1, a2, b0, b1, b2, c0, c1, c2) \ #define matrix3(a0, a1, a2, b0, b1, b2, c0, c1, c2) \
mat3(a0, b0, c0, a1, b1, c1, a2, b2, c2); mat3(a0, b0, c0, a1, b1, c1, a2, b2, c2);
// Yes it sucks! // Yes it sucks!
#define matrix4x3(v0, v1, v2, v3) \ #define matrix4x3(v0, v1, v2, v3) \
@ -87,13 +87,13 @@ layout(std140, binding = 14) uniform cb10
#else #else
#define matrix4(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3) \ #define matrix4(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3) \
float4x4(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3); float4x4(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3);
#define matrix3(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3) \ #define matrix3(a0, a1, a2, b0, b1, b2, c0, c1, c2) \
float3x3(a0, a1, a2, b0, b1, b2, c0, c1, c2); float3x3(a0, a1, a2, b0, b1, b2, c0, c1, c2);
#define matrix4x3(v0, v1, v2, v3) \ #define matrix4x3(v0, v1, v2, v3) \
float4x3(v0, v1, v2, v3); float4x3(v0, v1, v2, v3);
Texture2D Texture : register(t0); Texture2D Texture : register(t0);
SamplerState TextureSampler : register(s0); SamplerState TextureSampler : register(s0);