diff --git a/Source/Bind/FuncProcessor.cs b/Source/Bind/FuncProcessor.cs index 52a31839..191fd207 100644 --- a/Source/Bind/FuncProcessor.cs +++ b/Source/Bind/FuncProcessor.cs @@ -638,9 +638,9 @@ namespace Bind throw new NotSupportedException("String arrays with arity >= 2 are not currently supported."); } - p.QualifiedType = "String"; + p.QualifiedType = "IntPtr"; p.Pointer = 0; - p.Array = 1; + p.Array = 0; p.WrapperType |= WrapperTypes.StringArrayParameter; } @@ -1137,7 +1137,7 @@ namespace Bind } else { - p.QualifiedType = "String"; + p.QualifiedType = "String"; } } diff --git a/Source/OpenTK/Graphics/ES20/ES20.cs b/Source/OpenTK/Graphics/ES20/ES20.cs index 539fa5d3..2594cbc2 100644 --- a/Source/OpenTK/Graphics/ES20/ES20.cs +++ b/Source/OpenTK/Graphics/ES20/ES20.cs @@ -38828,7 +38828,7 @@ namespace OpenTK.Graphics.ES20 static extern unsafe void glShaderBinary(Int32 count, UInt32* shaders, System.Int32 binaryformat, IntPtr binary, Int32 length); [Slot(274)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length); + static extern unsafe void glShaderSource(UInt32 shader, Int32 count, IntPtr @string, Int32* length); [Slot(276)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glStencilFunc(System.Int32 func, Int32 @ref, UInt32 mask); @@ -38978,7 +38978,7 @@ namespace OpenTK.Graphics.ES20 static extern Int32 glCreateShaderProgramEXT(System.Int32 type, String @string); [Slot(48)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern Int32 glCreateShaderProgramvEXT(System.Int32 type, Int32 count, String[] strings); + static extern Int32 glCreateShaderProgramvEXT(System.Int32 type, Int32 count, IntPtr strings); [Slot(61)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern unsafe void glDeleteProgramPipelinesEXT(Int32 n, UInt32* pipelines); diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs index b044ef08..ad4272ba 100644 --- a/Source/OpenTK/Graphics/ES30/ES30.cs +++ b/Source/OpenTK/Graphics/ES30/ES30.cs @@ -49462,7 +49462,7 @@ namespace OpenTK.Graphics.ES30 static extern unsafe void glGetUniformfv(UInt32 program, Int32 location, [OutAttribute] Single* @params); [Slot(237)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glGetUniformIndices(UInt32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] UInt32* uniformIndices); + static extern unsafe void glGetUniformIndices(UInt32 program, Int32 uniformCount, IntPtr uniformNames, [OutAttribute] UInt32* uniformIndices); [Slot(238)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern unsafe void glGetUniformiv(UInt32 program, Int32 location, [OutAttribute] Int32* @params); @@ -49609,7 +49609,7 @@ namespace OpenTK.Graphics.ES30 static extern unsafe void glShaderBinary(Int32 count, UInt32* shaders, System.Int32 binaryformat, IntPtr binary, Int32 length); [Slot(350)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length); + static extern unsafe void glShaderSource(UInt32 shader, Int32 count, IntPtr @string, Int32* length); [Slot(352)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glStencilFunc(System.Int32 func, Int32 @ref, UInt32 mask); @@ -49660,7 +49660,7 @@ namespace OpenTK.Graphics.ES30 static extern void glTexSubImage3D(System.Int32 target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, System.Int32 format, System.Int32 type, IntPtr pixels); [Slot(377)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern void glTransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, System.Int32 bufferMode); + static extern void glTransformFeedbackVaryings(UInt32 program, Int32 count, IntPtr varyings, System.Int32 bufferMode); [Slot(378)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glUniform1f(Int32 location, Single v0); @@ -49843,7 +49843,7 @@ namespace OpenTK.Graphics.ES30 static extern Int32 glCreateShaderProgramEXT(System.Int32 type, String @string); [Slot(65)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern Int32 glCreateShaderProgramvEXT(System.Int32 type, Int32 count, String[] strings); + static extern Int32 glCreateShaderProgramvEXT(System.Int32 type, Int32 count, IntPtr strings); [Slot(78)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern unsafe void glDeleteProgramPipelinesEXT(Int32 n, UInt32* pipelines); diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs index 372dcc67..0122c352 100644 --- a/Source/OpenTK/Graphics/OpenGL/GL.cs +++ b/Source/OpenTK/Graphics/OpenGL/GL.cs @@ -129692,7 +129692,7 @@ namespace OpenTK.Graphics.OpenGL static extern void glCompileShaderARB(UInt32 shaderObj); [Slot(256)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glCompileShaderIncludeARB(UInt32 shader, Int32 count, String[] path, Int32* length); + static extern unsafe void glCompileShaderIncludeARB(UInt32 shader, Int32 count, IntPtr path, Int32* length); [Slot(264)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glCompressedTexImage1DARB(System.Int32 target, Int32 level, System.Int32 internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr data); @@ -130172,7 +130172,7 @@ namespace OpenTK.Graphics.OpenGL static extern void glSampleCoverageARB(Single value, bool invert); [Slot(1870)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glShaderSourceARB(UInt32 shaderObj, Int32 count, String[] @string, Int32* length); + static extern unsafe void glShaderSourceARB(UInt32 shaderObj, Int32 count, IntPtr @string, Int32* length); [Slot(1915)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glTexBufferARB(System.Int32 target, System.Int32 internalformat, UInt32 buffer); @@ -131135,7 +131135,7 @@ namespace OpenTK.Graphics.OpenGL static extern Int32 glCreateShader(System.Int32 type); [Slot(337)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern Int32 glCreateShaderProgramv(System.Int32 type, Int32 count, String[] strings); + static extern Int32 glCreateShaderProgramv(System.Int32 type, Int32 count, IntPtr strings); [Slot(340)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glCullFace(System.Int32 mode); @@ -131804,7 +131804,7 @@ namespace OpenTK.Graphics.OpenGL static extern unsafe void glGetUniformfv(UInt32 program, Int32 location, [OutAttribute] Single* @params); [Slot(965)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glGetUniformIndices(UInt32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] UInt32* uniformIndices); + static extern unsafe void glGetUniformIndices(UInt32 program, Int32 uniformCount, IntPtr uniformNames, [OutAttribute] UInt32* uniformIndices); [Slot(966)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern unsafe void glGetUniformiv(UInt32 program, Int32 location, [OutAttribute] Int32* @params); @@ -132764,7 +132764,7 @@ namespace OpenTK.Graphics.OpenGL static extern unsafe void glShaderBinary(Int32 count, UInt32* shaders, System.Int32 binaryformat, IntPtr binary, Int32 length); [Slot(1869)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length); + static extern unsafe void glShaderSource(UInt32 shader, Int32 count, IntPtr @string, Int32* length); [Slot(1871)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glShaderStorageBlockBinding(UInt32 program, UInt32 storageBlockIndex, UInt32 storageBlockBinding); @@ -133007,7 +133007,7 @@ namespace OpenTK.Graphics.OpenGL static extern void glTextureView(UInt32 texture, System.Int32 target, UInt32 origtexture, System.Int32 internalformat, UInt32 minlevel, UInt32 numlevels, UInt32 minlayer, UInt32 numlayers); [Slot(2088)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern void glTransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, System.Int32 bufferMode); + static extern void glTransformFeedbackVaryings(UInt32 program, Int32 count, IntPtr varyings, System.Int32 bufferMode); [Slot(2092)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glTranslated(Double x, Double y, Double z); @@ -133850,7 +133850,7 @@ namespace OpenTK.Graphics.OpenGL static extern Int32 glCreateShaderProgramEXT(System.Int32 type, String @string); [Slot(338)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern Int32 glCreateShaderProgramvEXT(System.Int32 type, Int32 count, String[] strings); + static extern Int32 glCreateShaderProgramvEXT(System.Int32 type, Int32 count, IntPtr strings); [Slot(341)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern unsafe void glCullParameterdvEXT(System.Int32 pname, [OutAttribute] Double* @params); @@ -134975,7 +134975,7 @@ namespace OpenTK.Graphics.OpenGL static extern void glTextureSubImage3DEXT(UInt32 texture, System.Int32 target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, System.Int32 format, System.Int32 type, IntPtr pixels); [Slot(2089)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern void glTransformFeedbackVaryingsEXT(UInt32 program, Int32 count, String[] varyings, System.Int32 bufferMode); + static extern void glTransformFeedbackVaryingsEXT(UInt32 program, Int32 count, IntPtr varyings, System.Int32 bufferMode); [Slot(2110)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glUniform1uiEXT(Int32 location, UInt32 v0); diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4.cs b/Source/OpenTK/Graphics/OpenGL4/GL4.cs index 70903677..8697e147 100644 --- a/Source/OpenTK/Graphics/OpenGL4/GL4.cs +++ b/Source/OpenTK/Graphics/OpenGL4/GL4.cs @@ -49636,7 +49636,7 @@ namespace OpenTK.Graphics.OpenGL4 static extern void glBlendFuncSeparateiARB(UInt32 buf, System.Int32 srcRGB, System.Int32 dstRGB, System.Int32 srcAlpha, System.Int32 dstAlpha); [Slot(72)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glCompileShaderIncludeARB(UInt32 shader, Int32 count, String[] path, Int32* length); + static extern unsafe void glCompileShaderIncludeARB(UInt32 shader, Int32 count, IntPtr path, Int32* length); [Slot(99)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern unsafe IntPtr glCreateSyncFromCLeventARB([OutAttribute] IntPtr* context, [OutAttribute] IntPtr* @event, UInt32 flags); @@ -50071,7 +50071,7 @@ namespace OpenTK.Graphics.OpenGL4 static extern Int32 glCreateShader(System.Int32 type); [Slot(98)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern Int32 glCreateShaderProgramv(System.Int32 type, Int32 count, String[] strings); + static extern Int32 glCreateShaderProgramv(System.Int32 type, Int32 count, IntPtr strings); [Slot(100)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glCullFace(System.Int32 mode); @@ -50587,7 +50587,7 @@ namespace OpenTK.Graphics.OpenGL4 static extern unsafe void glGetUniformfv(UInt32 program, Int32 location, [OutAttribute] Single* @params); [Slot(308)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glGetUniformIndices(UInt32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] UInt32* uniformIndices); + static extern unsafe void glGetUniformIndices(UInt32 program, Int32 uniformCount, IntPtr uniformNames, [OutAttribute] UInt32* uniformIndices); [Slot(309)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern unsafe void glGetUniformiv(UInt32 program, Int32 location, [OutAttribute] Int32* @params); @@ -51043,7 +51043,7 @@ namespace OpenTK.Graphics.OpenGL4 static extern unsafe void glShaderBinary(Int32 count, UInt32* shaders, System.Int32 binaryformat, IntPtr binary, Int32 length); [Slot(479)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern unsafe void glShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length); + static extern unsafe void glShaderSource(UInt32 shader, Int32 count, IntPtr @string, Int32* length); [Slot(480)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glShaderStorageBlockBinding(UInt32 program, UInt32 storageBlockIndex, UInt32 storageBlockBinding); @@ -51157,7 +51157,7 @@ namespace OpenTK.Graphics.OpenGL4 static extern void glTextureView(UInt32 texture, System.Int32 target, UInt32 origtexture, System.Int32 internalformat, UInt32 minlevel, UInt32 numlevels, UInt32 minlayer, UInt32 numlayers); [Slot(518)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - static extern void glTransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, System.Int32 bufferMode); + static extern void glTransformFeedbackVaryings(UInt32 program, Int32 count, IntPtr varyings, System.Int32 bufferMode); [Slot(519)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] static extern void glUniform1d(Int32 location, Double x);