mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-12 12:08:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicsdriver/opengl: remove the version es100

Browse Source 
es300 is requried for 'texelFetch' [1].

[1] https://registry.khronos.org/OpenGL-Refpages/es3.0/html/texelFetch.xhtml

Updates #1431
This commit is contained in:
Hajime Hoshi 2023-04-19 22:09:34 +09:00
parent 2f55bb1b3d
commit 7509c1d7f5
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/graphicsdriver/opengl/context_notjs.go
View File

@ -25,7 +25,7 @@ type contextPlatform struct {
func (c *context) glslVersion() glsl.GLSLVersion { func (c *context) glslVersion() glsl.GLSLVersion {
if c.ctx.IsES() { if c.ctx.IsES() {
return glsl.GLSLVersionES100 return glsl.GLSLVersionES300
} }
return glsl.GLSLVersionDefault return glsl.GLSLVersionDefault
} }

9
internal/shaderir/glsl/glsl.go
View File

@ -28,7 +28,6 @@ type GLSLVersion int
const ( const (
GLSLVersionDefault GLSLVersion = iota GLSLVersionDefault GLSLVersion = iota
GLSLVersionES100
GLSLVersionES300 GLSLVersionES300
) )
@ -65,8 +64,6 @@ func VertexPrelude(version GLSLVersion) string {
switch version { switch version {
case GLSLVersionDefault: case GLSLVersionDefault:
return utilFunctions return utilFunctions
case GLSLVersionES100:
return utilFunctions
case GLSLVersionES300: case GLSLVersionES300:
return `#version 300 es` return `#version 300 es`
} }
@ -76,8 +73,6 @@ func VertexPrelude(version GLSLVersion) string {
func FragmentPrelude(version GLSLVersion) string { func FragmentPrelude(version GLSLVersion) string {
var prefix string var prefix string
switch version { switch version {
case GLSLVersionES100:
prefix = `#extension GL_OES_standard_derivatives : enable` + "\n\n"
case GLSLVersionES300: case GLSLVersionES300:
prefix = `#version 300 es` + "\n\n" prefix = `#version 300 es` + "\n\n"
} }
@ -89,7 +84,7 @@ precision highp int;
#define mediump #define mediump
#define highp #define highp
#endif` #endif`
if version == GLSLVersionDefault || version == GLSLVersionES100 { if version == GLSLVersionDefault {
prelude += "\n\n" + utilFunctions prelude += "\n\n" + utilFunctions
} }
return prelude return prelude
@ -517,7 +512,7 @@ func (c *compileContext) block(p *shaderir.Program, topBlock, block *shaderir.Bl
} }
return fmt.Sprintf("%s(%s)", op, expr(&e.Exprs[0])) return fmt.Sprintf("%s(%s)", op, expr(&e.Exprs[0]))
case shaderir.Binary: case shaderir.Binary:
if e.Op == shaderir.ModOp && (c.version == GLSLVersionDefault || c.version == GLSLVersionES100) { if e.Op == shaderir.ModOp && c.version == GLSLVersionDefault {
// '%' is not defined. // '%' is not defined.
return fmt.Sprintf("modInt((%s), (%s))", expr(&e.Exprs[0]), expr(&e.Exprs[1])) return fmt.Sprintf("modInt((%s), (%s))", expr(&e.Exprs[0]), expr(&e.Exprs[1]))
} }