Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround MoltenVK shader conversion error #62305

Merged
merged 1 commit into from
Jun 22, 2022
+4 −3
Merged

Workaround MoltenVK shader conversion error #62305

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions servers/rendering/renderer_rd/shaders/scene_forward_mobile.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ invariant gl_Position;

#GLOBALS

void main() {
SceneData scene_data = scene_data_block.data;
#define scene_data scene_data_block.data

void main() {
vec4 instance_custom = vec4(0.0);
#if defined(COLOR_USED)
color_interp = color_attrib;
Expand Down Expand Up @@ -576,13 +576,14 @@ vec4 fog_process(vec3 vertex) {

#endif //!MODE_RENDER DEPTH

#define scene_data scene_data_block.data

void main() {
#ifdef MODE_DUAL_PARABOLOID

if (dp_clip > 0.0)
discard;
#endif
SceneData scene_data = scene_data_block.data;

//lay out everything, whatever is unused is optimized away anyway
vec3 vertex = vertex_interp;
Expand Down