Skip to content

Commit 5d3e69f

Browse files
authored
Use gen_sig_info to auto-generate webgl2 signature information. NFC (#19108)
1 parent 4ea7592 commit 5d3e69f

File tree

6 files changed

+99
-95
lines changed

6 files changed

+99
-95
lines changed

src/library_glemu.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3434,7 +3434,6 @@ var LibraryGLEmulation = {
34343434
// Additional non-GLES rendering calls
34353435

34363436
glDrawRangeElements__deps: ['glDrawElements'],
3437-
glDrawRangeElements__sig: 'viiiiip',
34383437
glDrawRangeElements: function(mode, start, end, count, type, indices) {
34393438
_glDrawElements(mode, count, type, indices, start, end);
34403439
},

src/library_sigs.js

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,9 @@ sigs = {
621621
emscripten_webgl_enable_ANGLE_instanced_arrays__sig: 'ii',
622622
emscripten_webgl_enable_OES_vertex_array_object__sig: 'ii',
623623
emscripten_webgl_enable_WEBGL_draw_buffers__sig: 'ii',
624+
emscripten_webgl_enable_WEBGL_draw_instanced_base_vertex_base_instance__sig: 'ii',
624625
emscripten_webgl_enable_WEBGL_multi_draw__sig: 'ii',
626+
emscripten_webgl_enable_WEBGL_multi_draw_instanced_base_vertex_base_instance__sig: 'ii',
625627
emscripten_webgl_enable_extension__sig: 'iip',
626628
emscripten_webgl_get_context_attributes__sig: 'iip',
627629
emscripten_webgl_get_current_context__sig: 'i',
@@ -692,41 +694,61 @@ sigs = {
692694
glActiveTexture__sig: 'vi',
693695
glAttachShader__sig: 'vii',
694696
glBegin__sig: 'vi',
697+
glBeginQuery__sig: 'vii',
698+
glBeginTransformFeedback__sig: 'vi',
695699
glBindAttribLocation__sig: 'viip',
696700
glBindBuffer__sig: 'vii',
701+
glBindBufferBase__sig: 'viii',
702+
glBindBufferRange__sig: 'viiipp',
697703
glBindFramebuffer__sig: 'vii',
698704
glBindRenderbuffer__sig: 'vii',
705+
glBindSampler__sig: 'vii',
699706
glBindTexture__sig: 'vii',
707+
glBindTransformFeedback__sig: 'vii',
700708
glBindVertexArray__sig: 'vi',
701709
glBindVertexArrayOES__sig: 'vi',
702710
glBlendColor__sig: 'vffff',
703711
glBlendEquation__sig: 'vi',
704712
glBlendEquationSeparate__sig: 'vii',
705713
glBlendFunc__sig: 'vii',
706714
glBlendFuncSeparate__sig: 'viiii',
715+
glBlitFramebuffer__sig: 'viiiiiiiiii',
707716
glBufferData__sig: 'vippi',
708717
glBufferSubData__sig: 'vippp',
709718
glCheckFramebufferStatus__sig: 'ii',
710719
glClear__sig: 'vi',
720+
glClearBufferfi__sig: 'viifi',
721+
glClearBufferfv__sig: 'viip',
722+
glClearBufferiv__sig: 'viip',
723+
glClearBufferuiv__sig: 'viip',
711724
glClearColor__sig: 'vffff',
712725
glClearDepth__sig: 'vd',
713726
glClearDepthf__sig: 'vf',
714727
glClearStencil__sig: 'vi',
728+
glClientWaitSync__sig: 'ipij',
715729
glColorMask__sig: 'viiii',
716730
glCompileShader__sig: 'vi',
717731
glCompressedTexImage2D__sig: 'viiiiiiip',
732+
glCompressedTexImage3D__sig: 'viiiiiiiip',
718733
glCompressedTexSubImage2D__sig: 'viiiiiiiip',
734+
glCompressedTexSubImage3D__sig: 'viiiiiiiiiip',
735+
glCopyBufferSubData__sig: 'viippp',
719736
glCopyTexImage2D__sig: 'viiiiiiii',
720737
glCopyTexSubImage2D__sig: 'viiiiiiii',
738+
glCopyTexSubImage3D__sig: 'viiiiiiiii',
721739
glCreateProgram__sig: 'i',
722740
glCreateShader__sig: 'ii',
723741
glCullFace__sig: 'vi',
724742
glDeleteBuffers__sig: 'vip',
725743
glDeleteFramebuffers__sig: 'vip',
726744
glDeleteProgram__sig: 'vi',
745+
glDeleteQueries__sig: 'vip',
727746
glDeleteRenderbuffers__sig: 'vip',
747+
glDeleteSamplers__sig: 'vip',
728748
glDeleteShader__sig: 'vi',
749+
glDeleteSync__sig: 'vp',
729750
glDeleteTextures__sig: 'vip',
751+
glDeleteTransformFeedbacks__sig: 'vip',
730752
glDeleteVertexArrays__sig: 'vip',
731753
glDeleteVertexArraysOES__sig: 'vip',
732754
glDepthFunc__sig: 'vi',
@@ -738,59 +760,97 @@ sigs = {
738760
glDisableVertexAttribArray__sig: 'vi',
739761
glDrawArrays__sig: 'viii',
740762
glDrawArraysInstanced__sig: 'viiii',
763+
glDrawArraysInstancedBaseInstance__sig: 'viiiii',
741764
glDrawBuffers__sig: 'vip',
742765
glDrawElements__sig: 'viiip',
743766
glDrawElementsInstanced__sig: 'viiipi',
767+
glDrawRangeElements__sig: 'viiiiip',
744768
glEnable__sig: 'vi',
745769
glEnableVertexAttribArray__sig: 'vi',
770+
glEndQuery__sig: 'vi',
771+
glEndTransformFeedback__sig: 'v',
772+
glFenceSync__sig: 'pii',
746773
glFinish__sig: 'v',
747774
glFlush__sig: 'v',
748775
glFlushMappedBufferRange__sig: 'vipp',
749776
glFramebufferRenderbuffer__sig: 'viiii',
750777
glFramebufferTexture2D__sig: 'viiiii',
778+
glFramebufferTextureLayer__sig: 'viiiii',
751779
glFrontFace__sig: 'vi',
752780
glGenBuffers__sig: 'vip',
753781
glGenFramebuffers__sig: 'vip',
782+
glGenQueries__sig: 'vip',
754783
glGenRenderbuffers__sig: 'vip',
784+
glGenSamplers__sig: 'vip',
755785
glGenTextures__sig: 'vip',
786+
glGenTransformFeedbacks__sig: 'vip',
756787
glGenVertexArrays__sig: 'vip',
757788
glGenVertexArraysOES__sig: 'vip',
758789
glGenerateMipmap__sig: 'vi',
759790
glGetActiveAttrib__sig: 'viiipppp',
760791
glGetActiveUniform__sig: 'viiipppp',
792+
glGetActiveUniformBlockName__sig: 'viiipp',
793+
glGetActiveUniformBlockiv__sig: 'viiip',
794+
glGetActiveUniformsiv__sig: 'viipip',
761795
glGetAttachedShaders__sig: 'viipp',
762796
glGetAttribLocation__sig: 'iip',
763797
glGetBooleanv__sig: 'vip',
798+
glGetBufferParameteri64v__sig: 'viip',
764799
glGetBufferParameteriv__sig: 'viip',
765800
glGetBufferPointerv__sig: 'viip',
801+
glGetBufferSubData__sig: 'vippp',
766802
glGetError__sig: 'i',
767803
glGetFloatv__sig: 'vip',
804+
glGetFragDataLocation__sig: 'iip',
768805
glGetFramebufferAttachmentParameteriv__sig: 'viiip',
806+
glGetInteger64i_v__sig: 'viip',
807+
glGetInteger64v__sig: 'vip',
808+
glGetIntegeri_v__sig: 'viip',
769809
glGetIntegerv__sig: 'vip',
810+
glGetInternalformativ__sig: 'viiiip',
811+
glGetProgramBinary__sig: 'viippp',
770812
glGetProgramInfoLog__sig: 'viipp',
771813
glGetProgramiv__sig: 'viip',
814+
glGetQueryObjectuiv__sig: 'viip',
815+
glGetQueryiv__sig: 'viip',
772816
glGetRenderbufferParameteriv__sig: 'viip',
817+
glGetSamplerParameterfv__sig: 'viip',
818+
glGetSamplerParameteriv__sig: 'viip',
773819
glGetShaderInfoLog__sig: 'viipp',
774820
glGetShaderPrecisionFormat__sig: 'viipp',
775821
glGetShaderSource__sig: 'viipp',
776822
glGetShaderiv__sig: 'viip',
777823
glGetString__sig: 'pi',
824+
glGetStringi__sig: 'pii',
825+
glGetSynciv__sig: 'vpiipp',
778826
glGetTexParameterfv__sig: 'viip',
779827
glGetTexParameteriv__sig: 'viip',
828+
glGetTransformFeedbackVarying__sig: 'viiipppp',
829+
glGetUniformBlockIndex__sig: 'iip',
830+
glGetUniformIndices__sig: 'viipp',
780831
glGetUniformLocation__sig: 'iip',
781832
glGetUniformfv__sig: 'viip',
782833
glGetUniformiv__sig: 'viip',
834+
glGetUniformuiv__sig: 'viip',
835+
glGetVertexAttribIiv__sig: 'viip',
836+
glGetVertexAttribIuiv__sig: 'viip',
783837
glGetVertexAttribPointerv__sig: 'viip',
784838
glGetVertexAttribfv__sig: 'viip',
785839
glGetVertexAttribiv__sig: 'viip',
786840
glHint__sig: 'vii',
841+
glInvalidateFramebuffer__sig: 'viip',
842+
glInvalidateSubFramebuffer__sig: 'viipiiii',
787843
glIsBuffer__sig: 'ii',
788844
glIsEnabled__sig: 'ii',
789845
glIsFramebuffer__sig: 'ii',
790846
glIsProgram__sig: 'ii',
847+
glIsQuery__sig: 'ii',
791848
glIsRenderbuffer__sig: 'ii',
849+
glIsSampler__sig: 'ii',
792850
glIsShader__sig: 'ii',
851+
glIsSync__sig: 'ip',
793852
glIsTexture__sig: 'ii',
853+
glIsTransformFeedback__sig: 'ii',
794854
glIsVertexArray__sig: 'ii',
795855
glIsVertexArrayOES__sig: 'ii',
796856
glLineWidth__sig: 'vf',
@@ -800,12 +860,22 @@ sigs = {
800860
glMatrixMode__sig: 'vi',
801861
glMultiDrawArrays__sig: 'vippi',
802862
glMultiDrawElements__sig: 'vipipi',
863+
glPauseTransformFeedback__sig: 'v',
803864
glPixelStorei__sig: 'vii',
804865
glPolygonOffset__sig: 'vff',
866+
glProgramBinary__sig: 'viipi',
867+
glProgramParameteri__sig: 'viii',
868+
glReadBuffer__sig: 'vi',
805869
glReadPixels__sig: 'viiiiiip',
806870
glReleaseShaderCompiler__sig: 'v',
807871
glRenderbufferStorage__sig: 'viiii',
872+
glRenderbufferStorageMultisample__sig: 'viiiii',
873+
glResumeTransformFeedback__sig: 'v',
808874
glSampleCoverage__sig: 'vfi',
875+
glSamplerParameterf__sig: 'viif',
876+
glSamplerParameterfv__sig: 'viip',
877+
glSamplerParameteri__sig: 'viii',
878+
glSamplerParameteriv__sig: 'viip',
809879
glScissor__sig: 'viiii',
810880
glShaderBinary__sig: 'vipipi',
811881
glShaderSource__sig: 'viipp',
@@ -816,30 +886,50 @@ sigs = {
816886
glStencilOp__sig: 'viii',
817887
glStencilOpSeparate__sig: 'viiii',
818888
glTexImage2D__sig: 'viiiiiiiip',
889+
glTexImage3D__sig: 'viiiiiiiiip',
819890
glTexParameterf__sig: 'viif',
820891
glTexParameterfv__sig: 'viip',
821892
glTexParameteri__sig: 'viii',
822893
glTexParameteriv__sig: 'viip',
894+
glTexStorage2D__sig: 'viiiii',
895+
glTexStorage3D__sig: 'viiiiii',
823896
glTexSubImage2D__sig: 'viiiiiiiip',
897+
glTexSubImage3D__sig: 'viiiiiiiiiip',
898+
glTransformFeedbackVaryings__sig: 'viipi',
824899
glUniform1f__sig: 'vif',
825900
glUniform1fv__sig: 'viip',
826901
glUniform1i__sig: 'vii',
827902
glUniform1iv__sig: 'viip',
903+
glUniform1ui__sig: 'vii',
904+
glUniform1uiv__sig: 'viip',
828905
glUniform2f__sig: 'viff',
829906
glUniform2fv__sig: 'viip',
830907
glUniform2i__sig: 'viii',
831908
glUniform2iv__sig: 'viip',
909+
glUniform2ui__sig: 'viii',
910+
glUniform2uiv__sig: 'viip',
832911
glUniform3f__sig: 'vifff',
833912
glUniform3fv__sig: 'viip',
834913
glUniform3i__sig: 'viiii',
835914
glUniform3iv__sig: 'viip',
915+
glUniform3ui__sig: 'viiii',
916+
glUniform3uiv__sig: 'viip',
836917
glUniform4f__sig: 'viffff',
837918
glUniform4fv__sig: 'viip',
838919
glUniform4i__sig: 'viiiii',
839920
glUniform4iv__sig: 'viip',
921+
glUniform4ui__sig: 'viiiii',
922+
glUniform4uiv__sig: 'viip',
923+
glUniformBlockBinding__sig: 'viii',
840924
glUniformMatrix2fv__sig: 'viiip',
925+
glUniformMatrix2x3fv__sig: 'viiip',
926+
glUniformMatrix2x4fv__sig: 'viiip',
841927
glUniformMatrix3fv__sig: 'viiip',
928+
glUniformMatrix3x2fv__sig: 'viiip',
929+
glUniformMatrix3x4fv__sig: 'viiip',
842930
glUniformMatrix4fv__sig: 'viiip',
931+
glUniformMatrix4x2fv__sig: 'viiip',
932+
glUniformMatrix4x3fv__sig: 'viiip',
843933
glUnmapBuffer__sig: 'ii',
844934
glUseProgram__sig: 'vi',
845935
glValidateProgram__sig: 'vi',
@@ -852,9 +942,15 @@ sigs = {
852942
glVertexAttrib4f__sig: 'viffff',
853943
glVertexAttrib4fv__sig: 'vip',
854944
glVertexAttribDivisor__sig: 'vii',
945+
glVertexAttribI4i__sig: 'viiiii',
946+
glVertexAttribI4iv__sig: 'vip',
947+
glVertexAttribI4ui__sig: 'viiiii',
948+
glVertexAttribI4uiv__sig: 'vip',
949+
glVertexAttribIPointer__sig: 'viiiip',
855950
glVertexAttribPointer__sig: 'viiiiip',
856951
glVertexPointer__sig: 'viiip',
857952
glViewport__sig: 'viiii',
953+
glWaitSync__sig: 'vpij',
858954
glewGetErrorString__sig: 'pi',
859955
glewGetExtension__sig: 'ip',
860956
glewGetString__sig: 'pi',

0 commit comments

Comments
 (0)