From 811a54e260512f4da4638e3074c98140b151be0e Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Fri, 28 Jan 2022 10:55:11 -0600
Subject: [PATCH] Fixed bug with sourcing from multiple gl shaders

---
 modules/opengles/onyx_opengles.c  |   8 ++++----
 modules/opengles/onyx_opengles.so | Bin 237120 -> 237120 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/opengles/onyx_opengles.c b/modules/opengles/onyx_opengles.c
index ba757fcc..c03b479c 100644
--- a/modules/opengles/onyx_opengles.c
+++ b/modules/opengles/onyx_opengles.c
@@ -527,10 +527,10 @@ ONYX_GL_INT_4_PTR(glGetInternalformativ, GLint)
 
 ONYX_DEF(glShaderSource, (INT, INT, PTR, PTR), ()) {
     GLsizei count = params->data[1].of.i32;
-    int base_ptr = *(int *) ONYX_PTR(params->data[2].of.i32);
+    int* base_ptr = (int *) ONYX_PTR(params->data[2].of.i32);
     char** strs = alloca(count * sizeof(char *));
     for (int i=0; i<count; i++) {
-        strs[i] = (char *) ONYX_PTR(base_ptr + i * 4);
+        strs[i] = (char *) ONYX_PTR(*(base_ptr + i));
     }
 
     glad_glShaderSource(params->data[0].of.i32, count, strs, (GLint *) ONYX_PTR(params->data[3].of.i32));
@@ -539,10 +539,10 @@ ONYX_DEF(glShaderSource, (INT, INT, PTR, PTR), ()) {
 
 ONYX_DEF(glGetUniformIndices, (INT, INT, PTR, PTR), ()) {
     GLsizei count = params->data[1].of.i32;
-    int base_ptr = *(int *) ONYX_PTR(params->data[2].of.i32);
+    int* base_ptr = (int *) ONYX_PTR(params->data[2].of.i32);
     char** strs = alloca(count * sizeof(char *));
     for (int i=0; i<count; i++) {
-        strs[i] = (char *) ONYX_PTR(base_ptr + i * 4);
+        strs[i] = (char *) ONYX_PTR(*(base_ptr + i));
     }
     
     glad_glGetUniformIndices(params->data[0].of.i32, count, (const char *const*) strs, (int *) ONYX_PTR(params->data[3].of.i32));
diff --git a/modules/opengles/onyx_opengles.so b/modules/opengles/onyx_opengles.so
index cc89c8ceae7de89bc5d293eed274a2f643a69003..2b34641b14c9c438794dd39ee4952e529eff0345 100755
GIT binary patch
delta 796
zcmX@Ghws21z6mop?=EHlgS#6Snlp(!=y=>^rYw+u>tb@$G^wdCdZXOKH@{&Lk!D=I
znNe<f4`a^enX67-VZ1VZVk4v2^vZfh8+MOQ*BjlgSElc+XY8%N05a@#O}Fa>j~O1l
zBCQ~<N4M(@55^1K46O%B96h>OmuG^+fGEHL$eRh{IS6=k9{+#Iqw^3{HxH8T6F~Jd
zfQGzg-2pPPJM@A_@+FU6o~sZGLLYcAp7Q8q5@~k5zzEcC?Rtg3r{e$r|3C{2r=M<M
zlo61D*#owfFLU}rDMpd$bL$y7rdN0aS?Z090&-V6kNv+4w!x!2^hJt?wuq_*(1sG$
z7rWyB|DUd2&u9(xyFg3^vM>BH;O0q?9wHg($Yw>sc(e+UEJ%plO+&Wzd>Y&bNFgGP
zJ4C9dH#9R!h(&=-3H{;GDF6)YKfq9qJ<PzceN8i?0nfGxjCUkBT^{`ZKLHqw&D)=@
zVBD?XYR?1=Qdd5KHYR6YHrHlmW<w?(b`Ayx1)%U5AhBlq|Npqu$N<%R0IE5@{pm@@
z$vlh~wpU(boSwv(vt7`VsXl?xe)`0jOyQh4jf_Br3=H<uKLWWxRi3k$%J~^rZ$G$_
gY5oUBz3GXwnDu!tG(%K@>B)sRg|}~*#XNx-0AkG)CIA2c

delta 793
zcmX@Ghws21z6mopcP?fCgPj`}nlp(c{LqdnZb@r#IJ3U+@Qqx1&zq(`o8K^rNHcbB
zW|W)W!x+7J=Bkrd7;j8Zu4fG5=w|42z0>V_WBQ(Y#@_lXAcJ1#b-P~a6=?;ryIt=v
zUT8f~V&&1zx;B%6!J`|90vv$6`7oY?fJf)?|Cc;E4*?Z>B%c6kKKOviV}=Lg2@l2#
zuUU71%?Z8Yk$lOcm**;o=g}Sdz=QFWM<-LW>lH?z25Z+FHC-OvOsr1R?=&#V2<XBL
z2U{hdIenoNqsa8R^^6?TE4+a$i$+EPxf`9w{$B>04m9sYiifs{ss_;T64n=|<NyDk
zu3pb*t$xF!+x3J;w*!Yq^8p1Q1@%g92C`S;GvMY+kP;yE>By!O!gy2-kRC{Y{7*x+
z>SG$*!AJq(jypi+#{U2B(H;Ba<l)c!a=$`7I-h!U*8Tv-Vhz~b&>tS10zjTz76U`<
z;q4ci84Y+QPq?YFZ35#R2~Oh&|Nl<_hHT>Yrz;qDE4b=00Yll9PoRy-nU~GAnVDIE
ziHDtofk6Q%d<IC&-v0kTE;TYhH6MU#mTrG~l5sK*<C^W2*BGZKF-C6}v}CGJVAPvF
zaVAqZXLKVYP$2_@-t><^E>M-{ET(dP#?I{rS2E52z{oQ_aTc>a@0w<aDlk2{@TTzg
K4YQahFarQ<bsKsB

-- 
2.25.1