fix: opengl es related errors on weston

levovix0 · Oct 22, 2024 · 8c0dcfa · 8c0dcfa
1 parent 42efafa
commit 8c0dcfa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/sigui/render/contexts.nim b/src/sigui/render/contexts.nim
@@ -152,7 +152,7 @@ macro makeShader*(ctx: DrawContext, body: untyped): auto =
     frag: NimNode
     uniforms: Table[string, NimNode]
 
-  var version: NimNode = newLit "330 core"
+  var version: NimNode = newLit "300 es"
   var origBody = body
   var body = body
   if body.kind != nnkStmtList:

diff --git a/src/sigui/render/text.nim b/src/sigui/render/text.nim
@@ -41,9 +41,9 @@ proc render(familyBuffer: var GlyphFamilyBuffer, placement: var GlyphPlacement,
 
     glBindTexture(GlTexture2d, textureId)
 
-    let buffer = alloc0(ts * ts)
+    let buffer = alloc0(ts * ts * 4)
 
-    glTexImage2D(GlTexture2d, 0, GlR8.GLint, ts.GLsizei, ts.GLsizei, 0, GlRed, GlUnsignedByte, buffer)
+    glTexImage2D(GlTexture2d, 0, GlRgba.GLint, ts.GLsizei, ts.GLsizei, 0, GlRgba, GlUnsignedByte, buffer)
     glGenerateMipmap(GlTexture2d)
 
     glBindTexture(GlTexture2d, 0)

diff --git a/src/sigui/uibase.nim b/src/sigui/uibase.nim
@@ -1892,7 +1892,7 @@ macro generateInitRedrawWhenPropertyChangedMethod(t: typed) =
 registerReflection generateInitRedrawWhenPropertyChangedMethod, T is Uiobj and t != "Uiobj"
 
 
-converter toColor*(s: string{lit}): chroma.Color =
+proc toColor*(s: string): chroma.Color =
   case s.len
   of 3:
     result = chroma.Color(
@@ -1924,3 +1924,7 @@ converter toColor*(s: string{lit}): chroma.Color =
     )
   else:
     raise ValueError.newException("invalid color: " & s)
+
+
+converter litToColor*(s: string{lit}): chroma.Color =
+  s.toColor
diff --git a/tests/t_shaders.nim b/tests/t_shaders.nim
@@ -11,7 +11,7 @@ method draw*(this: ChessTiles, ctx: DrawContext) =
   this.drawBefore(ctx)
   if this.visibility == visible:
     let shader = ctx.makeShader:
-      {.version: "330 core".}
+      {.version: "300 es".}
 
       proc vert(
         gl_Position: var Vec4,