mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 11:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/shaderir: bug fix: float4x4(x) initialized all the components unexpectedly

Browse Source 
See https://docs.microsoft.com/en-us/windows/win32/direct3d9/casting-and-conversion#parameter-value-modifiers

Updates #1007
This commit is contained in:
Hajime Hoshi 2022-03-26 02:05:32 +09:00
parent cfd0de5c41
commit 52376170a4
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/shader/testdata/issue1236.expected.hlsl vendored
View File

@ -1,6 +1,6 @@
void F0(in float4 l0, out float4 l1) { void F0(in float4 l0, out float4 l1) {
float4 l2 = 0.0; float4 l2 = 0.0;
l2 = mul(l0, (float4x4)(1.0)); l2 = mul(l0, float4x4FromScalar(1.0));
l1 = l2; l1 = l2;
return; return;
} }

27
internal/shaderir/hlsl/hlsl.go
View File

@ -71,6 +71,18 @@ float3 mod(float3 x, float3 y) {
float4 mod(float4 x, float4 y) { float4 mod(float4 x, float4 y) {
return x - y * floor(x/y); return x - y * floor(x/y);
}
float2x2 float2x2FromScalar(float x) {
return float2x2(x, 0, 0, x);
}
float3x3 float3x3FromScalar(float x) {
return float3x3(x, 0, 0, 0, x, 0, 0, 0, x);
}
float4x4 float4x4FromScalar(float x) {
return float4x4(x, 0, 0, 0, 0, x, 0, 0, 0, 0, x, 0, 0, 0, 0, x);
}` }`
func Compile(p *shaderir.Program) (string, []int) { func Compile(p *shaderir.Program) (string, []int) {
@ -396,10 +408,19 @@ func (c *compileContext) block(p *shaderir.Program, topBlock, block *shaderir.Bl
// Use casting. For example, `float4(1)` doesn't work. // Use casting. For example, `float4(1)` doesn't work.
return fmt.Sprintf("(%s)(%s)", expr(&e.Exprs[0]), args[0]) return fmt.Sprintf("(%s)(%s)", expr(&e.Exprs[0]), args[0])
} }
case shaderir.Mat2F, shaderir.Mat3F, shaderir.Mat4F: case shaderir.Mat2F:
if len(args) == 1 { if len(args) == 1 {
// Use casting. For example, `float4x4(1)` doesn't work. // In HSLS, casting a scalar to a matrix initializes all the components.
return fmt.Sprintf("(%s)(%s)", expr(&e.Exprs[0]), args[0]) // There seems no easy way to have an identity matrix.
return fmt.Sprintf("float2x2FromScalar(%s)", args[0])
}
case shaderir.Mat3F:
if len(args) == 1 {
return fmt.Sprintf("float3x3FromScalar(%s)", args[0])
}
case shaderir.Mat4F:
if len(args) == 1 {
return fmt.Sprintf("float4x4FromScalar(%s)", args[0])
} }
case shaderir.Texture2DF: case shaderir.Texture2DF:
return fmt.Sprintf("%s.Sample(samp, %s)", args[0], strings.Join(args[1:], ", ")) return fmt.Sprintf("%s.Sample(samp, %s)", args[0], strings.Join(args[1:], ", "))