internal/shaderir: revert the refactoring to generalize the memory layout logic

Unfortunately, the memory layout was not so universal. For example,
the memory layout for mat2 is different between Metal and DirectX.

internal/graphicsdriver/directx/graphics11_windows.go

@@ -24,6 +24,7 @@ import (
 	"github.com/hajimehoshi/ebiten/v2/internal/graphics"
 	"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver"
 	"github.com/hajimehoshi/ebiten/v2/internal/shaderir"
+	"github.com/hajimehoshi/ebiten/v2/internal/shaderir/hlsl"
 )
 
 var inputElementDescsForDX11 []_D3D11_INPUT_ELEMENT_DESC
@@ -512,7 +513,7 @@ func (g *graphics11) NewShader(program *shaderir.Program) (graphicsdriver.Shader
 		graphics:         g,
 		id:               g.genNextShaderID(),
 		uniformTypes:     program.Uniforms,
-		uniformOffsets:   program.UniformOffsetsInDWords(),
+		uniformOffsets:   hlsl.UniformVariableOffsetsInDWords(program),
 		vertexShaderBlob: vsh,
 		pixelShaderBlob:  psh,
 	}

internal/graphicsdriver/directx/graphics12_windows.go

@@ -25,6 +25,7 @@ import (
 	"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver"
 	"github.com/hajimehoshi/ebiten/v2/internal/microsoftgdk"
 	"github.com/hajimehoshi/ebiten/v2/internal/shaderir"
+	"github.com/hajimehoshi/ebiten/v2/internal/shaderir/hlsl"
 )
 
 type resourceWithSize struct {
@@ -1072,7 +1073,7 @@ func (g *graphics12) NewShader(program *shaderir.Program) (graphicsdriver.Shader
 		graphics:       g,
 		id:             g.genNextShaderID(),
 		uniformTypes:   program.Uniforms,
-		uniformOffsets: program.UniformOffsetsInDWords(),
+		uniformOffsets: hlsl.UniformVariableOffsetsInDWords(program),
 		vertexShader:   vsh,
 		pixelShader:    psh,
 	}

internal/shaderir/hlsl/hlsl.go

@@ -81,7 +81,7 @@ float4x4 float4x4FromScalar(float x) {
 }`
 
 func Compile(p *shaderir.Program) (vertexShader, pixelShader, prelude string) {
-	offsets := p.UniformOffsetsInDWords()
+	offsets := UniformVariableOffsetsInDWords(p)
 
 	c := &compileContext{
 		unit: p.Unit,
@@ -119,8 +119,8 @@ func Compile(p *shaderir.Program) (vertexShader, pixelShader, prelude string) {
 		lines = append(lines, "cbuffer Uniforms : register(b0) {")
 		for i, t := range p.Uniforms {
 			// packingoffset is not mandatory, but this is useful to ensure the correct offset is used.
-			offset := fmt.Sprintf("c%d", offsets[i]/shaderir.UniformVariableBoundaryInDWords)
-			switch offsets[i] % shaderir.UniformVariableBoundaryInDWords {
+			offset := fmt.Sprintf("c%d", offsets[i]/UniformVariableBoundaryInDWords)
+			switch offsets[i] % UniformVariableBoundaryInDWords {
 			case 1:
 				offset += ".y"
 			case 2:

internal/shaderir/hlsl/uniform.go

@@ -12,20 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shaderir
+package hlsl
 
 import (
 	"fmt"
+
+	"github.com/hajimehoshi/ebiten/v2/internal/shaderir"
 )
 
 const UniformVariableBoundaryInDWords = 4
 
-// UniformOffsetsInDWords returns the offsets of the uniform variables in DWROD units in the HLSL layout.
-func (p *Program) UniformOffsetsInDWords() []int {
-	if len(p.offsetsInDWords) > 0 {
-		return p.offsetsInDWords
-	}
-
+// UniformVariableOffsetsInDWords returns the offsets of the uniform variables in DWROD units in the HLSL layout.
+func UniformVariableOffsetsInDWords(program *shaderir.Program) []int {
 	// https://docs.microsoft.com/en-us/windows/win32/direct3dhlsl/dx-graphics-hlsl-packing-rules
 	// https://github.com/microsoft/DirectXShaderCompiler/wiki/Buffer-Packing
 
@@ -41,70 +39,69 @@ func (p *Program) UniformOffsetsInDWords() []int {
 
 	// TODO: Reorder the variables with packoffset.
 	// See https://docs.microsoft.com/en-us/windows/win32/direct3dhlsl/dx-graphics-hlsl-variable-packoffset
-	for _, u := range p.Uniforms {
+	for _, u := range program.Uniforms {
 		switch u.Main {
-		case Float:
+		case shaderir.Float:
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			headInDWords += 1
-		case Int:
+		case shaderir.Int:
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			headInDWords += 1
-		case Vec2, IVec2:
+		case shaderir.Vec2, shaderir.IVec2:
 			if headInDWords%UniformVariableBoundaryInDWords >= 3 {
 				headInDWords = align(headInDWords)
 			}
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			headInDWords += 2
-		case Vec3, IVec3:
+		case shaderir.Vec3, shaderir.IVec3:
 			if headInDWords%UniformVariableBoundaryInDWords >= 2 {
 				headInDWords = align(headInDWords)
 			}
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			headInDWords += 3
-		case Vec4, IVec4:
+		case shaderir.Vec4, shaderir.IVec4:
 			if headInDWords%UniformVariableBoundaryInDWords >= 1 {
 				headInDWords = align(headInDWords)
 			}
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			headInDWords += 4
-		case Mat2:
+		case shaderir.Mat2:
 			// For matrices, each column is aligned to the boundary.
 			headInDWords = align(headInDWords)
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			headInDWords += 6
-		case Mat3:
+		case shaderir.Mat3:
 			headInDWords = align(headInDWords)
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			headInDWords += 11
-		case Mat4:
+		case shaderir.Mat4:
 			headInDWords = align(headInDWords)
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			headInDWords += 16
-		case Array:
+		case shaderir.Array:
 			// Each array is 16-byte aligned.
 			// TODO: What if the array has 2 or more dimensions?
 			headInDWords = align(headInDWords)
 			offsetsInDWords = append(offsetsInDWords, headInDWords)
 			n := u.Sub[0].Uint32Count()
 			switch u.Sub[0].Main {
-			case Mat2:
+			case shaderir.Mat2:
 				n = 6
-			case Mat3:
+			case shaderir.Mat3:
 				n = 11
-			case Mat4:
+			case shaderir.Mat4:
 				n = 16
 			}
 			headInDWords += (u.Length - 1) * align(n)
 			// The last element is not with a padding.
 			headInDWords += n
-		case Struct:
+		case shaderir.Struct:
 			// TODO: Implement this
-			panic("shaderir: offset for a struct is not implemented yet")
+			panic("hlsl: offset for a struct is not implemented yet")
 		default:
-			panic(fmt.Sprintf("shaderir: unexpected type: %s", u.String()))
+			panic(fmt.Sprintf("hlsl: unexpected type: %s", u.String()))
 		}
 	}
 
-	p.offsetsInDWords = offsetsInDWords
-	return p.offsetsInDWords
+	return offsetsInDWords
 }

internal/shaderir/program.go

@@ -59,8 +59,7 @@ type Program struct {
 
 	SourceHash SourceHash
 
-	uniformFactors  []uint32
-	offsetsInDWords []int
+	uniformFactors []uint32
 }
 
 type Func struct {