From 7d8250de03a0e7a4e6ce6f46a044f336bb8ef927 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Tue, 8 Mar 2022 20:56:36 -0600 Subject: [PATCH] updated opengles library to use cptr --- modules/opengles/module.onyx | 6 ++++-- modules/opengles/onyx_opengles.c | 22 ++++++++-------------- modules/opengles/onyx_opengles.so | Bin 237120 -> 237120 bytes 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/modules/opengles/module.onyx b/modules/opengles/module.onyx index 5abeb749..95b29a70 100644 --- a/modules/opengles/module.onyx +++ b/modules/opengles/module.onyx @@ -1,5 +1,7 @@ package opengles +use package core { cptr } + #library "onyx_opengles" GLGetProcAddress :: #distinct i64 // (name: cstr) -> ^void @@ -108,7 +110,7 @@ GLGetProcAddress :: #distinct i64 // (name: cstr) -> ^void glSampleCoverage :: (value: GLfloat, invert: GLboolean) -> void --- glScissor :: (x: GLint, y: GLint, width: GLsizei, height: GLsizei) -> void --- glShaderBinary :: (count: GLsizei, shaders: ^GLuint, binaryformat: GLenum, binary: rawptr, length: GLsizei) -> void --- - glShaderSource :: (shader: GLuint, count: GLsizei, string: ^^GLchar, length: ^GLint) -> void --- + glShaderSource :: (shader: GLuint, count: GLsizei, string: ^cptr(GLchar), length: ^GLint) -> void --- glStencilFunc :: (func: GLenum, ref: GLint, mask: GLuint) -> void --- glStencilFuncSeparate :: (face: GLenum, func: GLenum, ref: GLint, mask: GLuint) -> void --- glStencilMask :: (mask: GLuint) -> void --- @@ -217,7 +219,7 @@ GLGetProcAddress :: #distinct i64 // (name: cstr) -> ^void glClearBufferfi :: (buffer: GLenum, drawbuffer: GLint, depth: GLfloat, stencil: GLint) -> void --- glGetStringi :: (name: GLenum, index: GLuint) -> ^GLubyte --- glCopyBufferSubData :: (readTarget: GLenum, writeTarget: GLenum, readOffset: GLintptr, writeOffset: GLintptr, size: GLsizeiptr) -> void --- - glGetUniformIndices :: (program: GLuint, uniformCount: GLsizei, uniformNames: ^^GLchar, uniformIndices: ^GLuint) -> void --- + glGetUniformIndices :: (program: GLuint, uniformCount: GLsizei, uniformNames: ^cptr(GLchar), uniformIndices: ^GLuint) -> void --- glGetActiveUniformsiv :: (program: GLuint, uniformCount: GLsizei, uniformIndices: ^GLuint, pname: GLenum, params: ^GLint) -> void --- glGetUniformBlockIndex :: (program: GLuint, uniformBlockName: ^GLchar) -> GLuint --- glGetActiveUniformBlockiv :: (program: GLuint, uniformBlockIndex: GLuint, pname: GLenum, params: ^GLint) -> void --- diff --git a/modules/opengles/onyx_opengles.c b/modules/opengles/onyx_opengles.c index c03b479c..d6cabd10 100644 --- a/modules/opengles/onyx_opengles.c +++ b/modules/opengles/onyx_opengles.c @@ -526,26 +526,20 @@ ONYX_GL_INT_6(glTexStorage3D) 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); - char** strs = alloca(count * sizeof(char *)); - for (int i=0; idata[1].of.i32; + GLchar** sources = ONYX_PTR(params->data[2].of.i32); + GLint* lengths = ONYX_PTR(params->data[3].of.i32); - glad_glShaderSource(params->data[0].of.i32, count, strs, (GLint *) ONYX_PTR(params->data[3].of.i32)); + glad_glShaderSource(params->data[0].of.i32, count, sources, lengths); return NULL; } 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); - char** strs = alloca(count * sizeof(char *)); - for (int i=0; idata[1].of.i32; + GLchar** names = ONYX_PTR(params->data[2].of.i32); + GLint* lengths = ONYX_PTR(params->data[3].of.i32); - glad_glGetUniformIndices(params->data[0].of.i32, count, (const char *const*) strs, (int *) ONYX_PTR(params->data[3].of.i32)); + glad_glGetUniformIndices(params->data[0].of.i32, count, (const char *const*) names, lengths); return NULL; } diff --git a/modules/opengles/onyx_opengles.so b/modules/opengles/onyx_opengles.so index 2b34641b14c9c438794dd39ee4952e529eff0345..6015b67ee5adae213bb217c128d55e77277c7aef 100755 GIT binary patch delta 706 zcmX@Ghws21z6mq9Viz)iLF~ebi}bjDSVDL|EH~cz$0$--(Hpk%?FIj9>sg%~WVEML z_qA@={Dw(Hnn|~DGn3r39wyy}&9hd`zT)E1{Kmkev-XBZXXyoxZr2+g-3}Zc%?AX4 zRHy43BoPImNb7+TE01p0)maP-9^F6`-~i;!&6<8Ngi&UCg)^g|W~b{1Bs~TQJ)tOi z+_RRpXbBKrP1m71858vP=OD~P>35q_8<4?_616Xe&}|6(|OEsIwL2eh$HE) z%|vl+CQ+_M(c_+paBT?0wN2TCT>JmR4p5YwJp7qo?pLTs=Tl%PgZz0T1LU00A0C|o zKwec214HcL?H8IE4R|(BxY@w8Z35#R30~Iw|Nr-BFfgz_`2T;+_LnOdS1WkQ08Lw= zz`!tZ>;L}@j6jYnpFkUvGcOy{cOG^Q1_qG)37~x8Hr(@w~b|Fiqx&$T$#_5x0GKF#JHh?Sw0>3M| delta 1367 zcmdT^Z%7ki7{B-3Rzv1?**=(x2qh%J(l6nk4=(KJp&&-JqLEZ8rY3~2BKjxeFuKlx z7I``$NIzuR2gB-2Bu<4kC1}|aldNR~6a63rHA1?cyEPj@5kwz4j`w|k?>&Eh&+~il zRYt7Jh_$UVZLXKmpSj-l9!DBenm|nHz1gqC9=-hj%C?Q{$=T=Co{p^RF~4W$!NDbJ z&!+wSAkFP)rH#J9z@6@hHorI*O3X<6@a5Ex0cEV`X0DhNwh}GirF#;s~ zSX&Qk)Zz0dIH9m0jDqhSv#hEh%tOH>ltjE4;9FwQ5ct+jaU0q$E`TuRn^$oS1(6@? zmMJfrukZ3PGmt3oW(JxCoE004#*E0oh=oOiTv$uFcwXef$jfhU(IA#KgOo%Di`tH5 z+^X01l0|hTkrO!v)hW#S-P@Al9YXs~469;DB7-{$WD*3*b76w+ zWn9G8dPc=!MN^TUATy=Gg^322;m4e0cD=#Y`qc*SCfUupM4CK75ZzJiweUoJq31^& ztAQ?mSB!b_j8HN9Fd4Fn7Wgq4qV H8{X1y*=YC= -- 2.25.1