mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 19:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ebiten: panic if a non-existent uniform variable name is given"

Browse Source 
This reverts commit 1b8580fab7.

Reason: some existing applications don't work with this fix.

Updates #2710
This commit is contained in:
Hajime Hoshi 2023-08-24 14:13:16 +09:00
parent 3493358fd2
commit a9b2f5f9ca
3 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
image.go
View File

@ -582,8 +582,6 @@ var _ [len(DrawTrianglesShaderOptions{}.Images) - graphics.ShaderImageCount]stru
// //
// If a specified uniform variable's length or type doesn't match with an expected one, DrawTrianglesShader panics. // If a specified uniform variable's length or type doesn't match with an expected one, DrawTrianglesShader panics.
// //
// If a non-existent uniform variable name is specified, DrawTrianglesShader panics.
//
// When the image i is disposed, DrawTrianglesShader does nothing. // When the image i is disposed, DrawTrianglesShader does nothing.
func (i *Image) DrawTrianglesShader(vertices []Vertex, indices []uint16, shader *Shader, options *DrawTrianglesShaderOptions) { func (i *Image) DrawTrianglesShader(vertices []Vertex, indices []uint16, shader *Shader, options *DrawTrianglesShaderOptions) {
i.copyCheck() i.copyCheck()
@ -736,8 +734,6 @@ var _ [len(DrawRectShaderOptions{}.Images)]struct{} = [graphics.ShaderImageCount
// //
// If a specified uniform variable's length or type doesn't match with an expected one, DrawRectShader panics. // If a specified uniform variable's length or type doesn't match with an expected one, DrawRectShader panics.
// //
// If a non-existent uniform variable name is specified, DrawRectShader panics.
//
// In a shader, texCoord in Fragment represents a position in a source image. // In a shader, texCoord in Fragment represents a position in a source image.
// If no source images are specified, texCoord represents the position from (0, 0) to (width, height) in pixels. // If no source images are specified, texCoord represents the position from (0, 0) to (width, height) in pixels.
// If the unit is pixels by a compiler directive `//kage:unit pixelss`, texCoord values are valid. // If the unit is pixels by a compiler directive `//kage:unit pixelss`, texCoord values are valid.

17
internal/ui/shader.go
View File

@ -46,22 +46,6 @@ func (s *Shader) MarkDisposed() {
} }
func (s *Shader) AppendUniforms(dst []uint32, uniforms map[string]any) []uint32 { func (s *Shader) AppendUniforms(dst []uint32, uniforms map[string]any) []uint32 {
// Check the given names are valid.
// This is a linear search and not efficient, but the number of uniform variables should not be so big.
for n := range uniforms {
var found bool
for _, nn := range s.uniformNames {
if n == nn {
found = true
break
}
}
if found {
continue
}
panic(fmt.Sprintf("ui: unexpected uniform name: %s", n))
}
if s.uniformUint32Count == 0 { if s.uniformUint32Count == 0 {
for _, typ := range s.uniformTypes { for _, typ := range s.uniformTypes {
s.uniformUint32Count += typ.Uint32Count() s.uniformUint32Count += typ.Uint32Count()
@ -82,6 +66,7 @@ func (s *Shader) AppendUniforms(dst []uint32, uniforms map[string]any) []uint32
for i, name := range s.uniformNames { for i, name := range s.uniformNames {
typ := s.uniformTypes[i] typ := s.uniformTypes[i]
// Ignore if an unused name is specified (#2710).
if uv, ok := uniforms[name]; ok { if uv, ok := uniforms[name]; ok {
v := reflect.ValueOf(uv) v := reflect.ValueOf(uv)
t := v.Type() t := v.Type()

12
shader_test.go
View File

@ -1942,18 +1942,6 @@ func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
}, },
err: true, err: true,
}, },
{
uniforms: map[string]any{
"W": 1,
},
err: true,
},
{
uniforms: map[string]any{
"W": []int32{1, 2, 3},
},
err: true,
},
} }
for _, tc := range tests { for _, tc := range tests {
tc := tc tc := tc