Skip to content

Commit

Permalink
Work around Galaxy S22 compiler bugs
Browse files Browse the repository at this point in the history
Prevent line breaks in glsl macros, which cause a compiler error on this device.

Diffs=
3a638e61b1 Work around Galaxy S22 compiler bugs (#8549)

Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
  • Loading branch information
csmartdalton and csmartdalton committed Nov 13, 2024
1 parent 44d5551 commit 0c275fe
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
01bc166a8e787f118f0af938434cee6744aa505a
3a638e61b140a6fbd4dd9afeffef706ed1280387
14 changes: 6 additions & 8 deletions renderer/src/shaders/glsl.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@
#extension GL_KHR_blend_equation_advanced : require
#endif

#if defined(@USING_DEPTH_STENCIL) && defined(@ENABLE_CLIP_RECT) && \
defined(GL_ES)
// clang-format off
#if defined(@USING_DEPTH_STENCIL) && defined(@ENABLE_CLIP_RECT) && defined(GL_ES)
// clang-format on
#ifdef GL_EXT_clip_cull_distance
#extension GL_EXT_clip_cull_distance : require
#elif defined(GL_ANGLE_clip_cull_distance)
Expand Down Expand Up @@ -451,13 +452,10 @@

#define IMAGE_RECT_VERTEX_MAIN VERTEX_MAIN

#define IMAGE_MESH_VERTEX_MAIN(NAME, \
PositionAttr, \
position, \
UVAttr, \
uv, \
_vertexID) \
// clang-format off
#define IMAGE_MESH_VERTEX_MAIN(NAME, PositionAttr, position, UVAttr, uv, _vertexID) \
VERTEX_MAIN(NAME, PositionAttr, position, _vertexID, _instanceID)
// clang-format on

#define VARYING_INIT(NAME, TYPE)
#define VARYING_PACK(NAME)
Expand Down

0 comments on commit 0c275fe

Please sign in to comment.