From cd58f233417cc3761708039cfb439a08f689390e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Fri, 13 Jan 2023 23:17:17 +0100 Subject: [PATCH] * PChar -> PAnsiChar --- packages/opengles/examples/es2example1.pas | 18 +++++------ packages/opengles/src/gles11.pp | 2 +- packages/opengles/src/gles20.pas | 36 +++++++++++----------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/opengles/examples/es2example1.pas b/packages/opengles/examples/es2example1.pas index dfd97a58b9..811d442e42 100644 --- a/packages/opengles/examples/es2example1.pas +++ b/packages/opengles/examples/es2example1.pas @@ -22,14 +22,14 @@ const VertexArray:array[0..11] of single=(0,-1,0,1, ShaderPrecode={$ifdef ogles}''{$else}'#version 120'#10{$endif}; - VertexShaderSource:string=ShaderPrecode+'attribute vec4 position;'#10+ + VertexShaderSource:AnsiString=ShaderPrecode+'attribute vec4 position;'#10+ 'varying mediump vec2 pos;'#10+ 'void main(){'#10+ ' gl_Position=position;'#10+ ' pos=position.xy;'#10+ '}'; - FragmentShaderSource:string=ShaderPrecode+'varying mediump vec2 pos;'#10+ + FragmentShaderSource:AnsiString=ShaderPrecode+'varying mediump vec2 pos;'#10+ 'uniform mediump float phase;'#10+ 'void main(){'#10+ ' gl_FragColor=vec4(1.0,1.0,1.0,1.0)*sin(((pos.x*pos.x)+(pos.y*pos.y))*40.0+phase);'#10+ @@ -51,9 +51,9 @@ begin result:=(((((((((((Year*365)+Month)*31)+Day)*24)+hour)*60)+min)*60)+sec)*1000)+msec; end; -procedure PrintShaderInfoLog(Shader:TGLUint;ShaderType:string); +procedure PrintShaderInfoLog(Shader:TGLUint;ShaderType:AnsiString); var len,Success:TGLint; - Buffer:pchar; + Buffer:PAnsiChar; begin glGetShaderiv(Shader,GL_COMPILE_STATUS,@Success); if Success<>GL_TRUE then begin @@ -69,7 +69,7 @@ begin end; end; -function CreateShader(ShaderType:TGLenum;Source:pchar):TGLuint; +function CreateShader(ShaderType:TGLenum;Source:PAnsiChar):TGLuint; begin result:=glCreateShader(ShaderType); glShaderSource(result,1,@Source,nil); @@ -85,8 +85,8 @@ procedure Init; begin ShaderProgram:=glCreateProgram(); - VertexShader:=CreateShader(GL_VERTEX_SHADER,pchar(VertexShaderSource)); - FragmentShader:=CreateShader(GL_FRAGMENT_SHADER,pchar(FragmentShaderSource)); + VertexShader:=CreateShader(GL_VERTEX_SHADER,PAnsiChar(VertexShaderSource)); + FragmentShader:=CreateShader(GL_FRAGMENT_SHADER,PAnsiChar(FragmentShaderSource)); glAttachShader(ShaderProgram,VertexShader); glAttachShader(ShaderProgram,FragmentShader); @@ -147,7 +147,7 @@ const MOUSE_MASK=ButtonPressMask or ButtonReleaseMask or PointerMotionMask or Bu none); {$endif} - Title:string='GL test'; + Title:AnsiString='GL test'; var dpy:PXDisplay; win,root:TWindow; @@ -267,7 +267,7 @@ begin XSelectInput(Dpy,Win,FocusChangeMask or KeyPressMask or KeyReleaseMask or PropertyChangeMask or StructureNotifyMask or KeymapStateMask or PointerMotionMask or EnterWindowMask or LeaveWindowMask or ButtonPressMask or ButtonReleaseMask or ExposureMask); - XStoreName(dpy,win,pchar(Title)); + XStoreName(dpy,win,PAnsiChar(Title)); XFlush(dpy); XMoveWindow(dpy,win,0,0); diff --git a/packages/opengles/src/gles11.pp b/packages/opengles/src/gles11.pp index fd112fc23f..3d696aac72 100644 --- a/packages/opengles/src/gles11.pp +++ b/packages/opengles/src/gles11.pp @@ -1004,7 +1004,7 @@ implementation end; - procedure Loadgles(lib : pchar); + procedure Loadgles(lib : PAnsiChar); begin Freegles; hlib:=LoadLibrary(lib); diff --git a/packages/opengles/src/gles20.pas b/packages/opengles/src/gles20.pas index 7c594e5c0d..6567fc2148 100644 --- a/packages/opengles/src/gles20.pas +++ b/packages/opengles/src/gles20.pas @@ -51,7 +51,7 @@ uses SysUtils,dynlibs{$ifdef X},x,xlib{$endif}{$ifdef windows},Windows{$endif}; {$ENDIF} Type - Pchar = ^char; + PAnsiChar = ^AnsiChar; {$ifdef EGL} type @@ -323,7 +323,7 @@ type eglInitialize : function(dpy:EGLDisplay; major:pEGLint; minor:pEGLint):EGLBoolean;{$ifdef windows}stdcall;{$else}cdecl;{$endif} eglTerminate : function(dpy:EGLDisplay):EGLBoolean;{$ifdef windows}stdcall;{$else}cdecl;{$endif} (* Const before type ignored *) - eglQueryString : function(dpy:EGLDisplay; name:EGLint):pchar;{$ifdef windows}stdcall;{$else}cdecl;{$endif} + eglQueryString : function(dpy:EGLDisplay; name:EGLint):PAnsiChar;{$ifdef windows}stdcall;{$else}cdecl;{$endif} eglGetConfigs : function(dpy:EGLDisplay; configs:pEGLConfig; config_size:EGLint; num_config:pEGLint):EGLBoolean;{$ifdef windows}stdcall;{$else}cdecl;{$endif} (* Const before type ignored *) eglChooseConfig : function(dpy:EGLDisplay; attrib_list:pEGLint; configs:pEGLConfig; config_size:EGLint; num_config:pEGLint):EGLBoolean;{$ifdef windows}stdcall;{$else}cdecl;{$endif} @@ -369,7 +369,7 @@ type (* Const before type ignored *) var - eglGetProcAddress : function(procname:pchar):__eglMustCastToProperFunctionPointerType;{$ifdef windows}stdcall;{$else}cdecl;{$endif} + eglGetProcAddress : function(procname:PAnsiChar):__eglMustCastToProperFunctionPointerType;{$ifdef windows}stdcall;{$else}cdecl;{$endif} { Header file version number } { Current version at http://www.khronos.org/registry/egl/ } @@ -925,7 +925,7 @@ type glActiveTexture : procedure(texture:GLenum);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glAttachShader : procedure(_program:GLuint; shader:GLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} (* Const before type ignored *) - glBindAttribLocation : procedure(_program:GLuint; index:GLuint; name:pchar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glBindAttribLocation : procedure(_program:GLuint; index:GLuint; name:PAnsiChar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glBindBuffer : procedure(target:GLenum; buffer:GLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glBindFramebuffer : procedure(target:GLenum; framebuffer:GLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glBindRenderbuffer : procedure(target:GLenum; renderbuffer:GLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} @@ -991,12 +991,12 @@ type glGenRenderbuffers : procedure(n:GLsizei; renderbuffers:pGLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGenTextures : procedure(n:GLsizei; textures:pGLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetActiveAttrib : procedure(_program:GLuint; index:GLuint; bufsize:GLsizei; length:pGLsizei; size:pGLint; - _type:pGLenum; name:pchar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + _type:pGLenum; name:PAnsiChar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetActiveUniform : procedure(_program:GLuint; index:GLuint; bufsize:GLsizei; length:pGLsizei; size:pGLint; - _type:pGLenum; name:pchar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + _type:pGLenum; name:PAnsiChar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetAttachedShaders : procedure(_program:GLuint; maxcount:GLsizei; count:pGLsizei; shaders:pGLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} (* Const before type ignored *) - glGetAttribLocation : function(_program:GLuint; name:pchar):longint;{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glGetAttribLocation : function(_program:GLuint; name:PAnsiChar):longint;{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetBooleanv : procedure(pname:GLenum; params:pGLboolean);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetBufferParameteriv : procedure(target:GLenum; pname:GLenum; params:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetError : function:GLenum;{$ifdef windows}stdcall;{$else}cdecl;{$endif} @@ -1004,12 +1004,12 @@ type glGetFramebufferAttachmentParameteriv : procedure(target:GLenum; attachment:GLenum; pname:GLenum; params:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetIntegerv : procedure(pname:GLenum; params:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetProgramiv : procedure(_program:GLuint; pname:GLenum; params:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} - glGetProgramInfoLog : procedure(_program:GLuint; bufsize:GLsizei; length:pGLsizei; infolog:pchar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glGetProgramInfoLog : procedure(_program:GLuint; bufsize:GLsizei; length:pGLsizei; infolog:PAnsiChar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetRenderbufferParameteriv : procedure(target:GLenum; pname:GLenum; params:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetShaderiv : procedure(shader:GLuint; pname:GLenum; params:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} - glGetShaderInfoLog : procedure(shader:GLuint; bufsize:GLsizei; length:pGLsizei; infolog:pchar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glGetShaderInfoLog : procedure(shader:GLuint; bufsize:GLsizei; length:pGLsizei; infolog:PAnsiChar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetShaderPrecisionFormat : procedure(shadertype:GLenum; precisiontype:GLenum; range:pGLint; precision:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} - glGetShaderSource : procedure(shader:GLuint; bufsize:GLsizei; length:pGLsizei; source:pchar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glGetShaderSource : procedure(shader:GLuint; bufsize:GLsizei; length:pGLsizei; source:PAnsiChar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} (* Const before type ignored *) glGetString : function(name:GLenum):PGLubyte;{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetTexParameterfv : procedure(target:GLenum; pname:GLenum; params:pGLfloat);{$ifdef windows}stdcall;{$else}cdecl;{$endif} @@ -1017,7 +1017,7 @@ type glGetUniformfv : procedure(_program:GLuint; location:GLint; params:pGLfloat);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetUniformiv : procedure(_program:GLuint; location:GLint; params:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} (* Const before type ignored *) - glGetUniformLocation : function(_program:GLuint; name:pchar):longint;{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glGetUniformLocation : function(_program:GLuint; name:PAnsiChar):longint;{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetVertexAttribfv : procedure(index:GLuint; pname:GLenum; params:pGLfloat);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetVertexAttribiv : procedure(index:GLuint; pname:GLenum; params:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetVertexAttribPointerv : procedure(index:GLuint; pname:GLenum; pointer:Ppointer);{$ifdef windows}stdcall;{$else}cdecl;{$endif} @@ -1044,7 +1044,7 @@ type glShaderBinary : procedure(n:GLsizei; shaders:pGLuint; binaryformat:GLenum; binary:pointer; length:GLsizei);{$ifdef windows}stdcall;{$else}cdecl;{$endif} (* Const before type ignored *) (* Const before type ignored *) - glShaderSource : procedure(shader:GLuint; count:GLsizei; _string:Ppchar; length:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glShaderSource : procedure(shader:GLuint; count:GLsizei; _string:PPAnsiChar; length:pGLint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glStencilFunc : procedure(func:GLenum; ref:GLint; mask:GLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glStencilFuncSeparate : procedure(face:GLenum; func:GLenum; ref:GLint; mask:GLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glStencilMask : procedure(mask:GLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} @@ -1347,8 +1347,8 @@ type var glGetPerfMonitorGroupsAMD : procedure(numGroups:pGLint; groupsSize:GLsizei; groups:pGLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetPerfMonitorCountersAMD : procedure(group:GLuint; numCounters:pGLint; maxActiveCounters:pGLint; counterSize:GLsizei; counters:pGLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} - glGetPerfMonitorGroupStringAMD : procedure(group:GLuint; bufSize:GLsizei; length:pGLsizei; groupString:pchar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} - glGetPerfMonitorCounterStringAMD : procedure(group:GLuint; counter:GLuint; bufSize:GLsizei; length:pGLsizei; counterString:pchar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glGetPerfMonitorGroupStringAMD : procedure(group:GLuint; bufSize:GLsizei; length:pGLsizei; groupString:PAnsiChar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} + glGetPerfMonitorCounterStringAMD : procedure(group:GLuint; counter:GLuint; bufSize:GLsizei; length:pGLsizei; counterString:PAnsiChar);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGetPerfMonitorCounterInfoAMD : procedure(group:GLuint; counter:GLuint; pname:GLenum; data:pointer);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glGenPerfMonitorsAMD : procedure(n:GLsizei; monitors:pGLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} glDeletePerfMonitorsAMD : procedure(n:GLsizei; monitors:pGLuint);{$ifdef windows}stdcall;{$else}cdecl;{$endif} @@ -1367,11 +1367,11 @@ type { GL_EXT_texture_type_2_10_10_10_REV } GL_EXT_texture_type_2_10_10_10_REV = 1; -function glGetProcAddress(ahlib:tlibhandle;ProcName:pchar):pointer; +function glGetProcAddress(ahlib:tlibhandle;ProcName:PAnsiChar):pointer; implementation - function glGetProcAddress(ahlib:tlibhandle;ProcName:pchar):pointer; + function glGetProcAddress(ahlib:tlibhandle;ProcName:PAnsiChar):pointer; begin result:=dynlibs.GetProcAddress(ahlib,ProcName); {$ifdef EGL} @@ -1470,7 +1470,7 @@ implementation end; - procedure LoadEGL(lib : pchar); + procedure LoadEGL(lib : PAnsiChar); begin FreeEGL; EGLLib:=dynlibs.LoadLibrary(lib); @@ -1692,7 +1692,7 @@ implementation end; - procedure LoadGLESv2(lib : pchar); + procedure LoadGLESv2(lib : PAnsiChar); begin FreeGLESv2; GLESv2Lib:=dynlibs.LoadLibrary(lib);