Skip to content

Commit 7f01852

Browse files
committed
inc: opengl: Turn various GLubyte Ptrs into ZString Ptrs
http://www.freebasic.net/forum/viewtopic.php?p=206647#p206647 (cherry picked from commit 6d31308)
1 parent 01015b4 commit 7f01852

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Version 1.02.1
77

88
[fixed]
99
- 1.02.0 regression: win/winuser.bi: Renamed INPUT typedef to INPUT_ to avoid conflicts with the quirk keyword (due to bug #730)
10+
- 1.02.0 regression: OpenGL binding: glGetString() and some others use ZString Ptr instead of GLubyte Ptr again
1011

1112

1213
Version 1.02.0

inc/GL/mesa/gl.bi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ declare sub glPushClientAttrib(byval mask as GLbitfield)
607607
declare sub glPopClientAttrib()
608608
declare function glRenderMode(byval mode as GLenum) as GLint
609609
declare function glGetError() as GLenum
610-
declare function glGetString(byval name as GLenum) as const GLubyte ptr
610+
declare function glGetString(byval name as GLenum) as const zstring ptr
611611
declare sub glFinish()
612612
declare sub glFlush()
613613
declare sub glHint(byval target as GLenum, byval mode as GLenum)

inc/GL/mesa/glext.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ type PFNGLCLEARBUFFERIVPROC as sub(byval buffer as GLenum, byval drawbuffer as G
853853
type PFNGLCLEARBUFFERUIVPROC as sub(byval buffer as GLenum, byval drawbuffer as GLint, byval value as const GLuint ptr)
854854
type PFNGLCLEARBUFFERFVPROC as sub(byval buffer as GLenum, byval drawbuffer as GLint, byval value as const GLfloat ptr)
855855
type PFNGLCLEARBUFFERFIPROC as sub(byval buffer as GLenum, byval drawbuffer as GLint, byval depth as GLfloat, byval stencil as GLint)
856-
type PFNGLGETSTRINGIPROC as function(byval name as GLenum, byval index as GLuint) as const GLubyte ptr
856+
type PFNGLGETSTRINGIPROC as function(byval name as GLenum, byval index as GLuint) as const zstring ptr
857857
type PFNGLISRENDERBUFFERPROC as function(byval renderbuffer as GLuint) as GLboolean
858858
type PFNGLBINDRENDERBUFFERPROC as sub(byval target as GLenum, byval renderbuffer as GLuint)
859859
type PFNGLDELETERENDERBUFFERSPROC as sub(byval n as GLsizei, byval renderbuffers as const GLuint ptr)
@@ -939,7 +939,7 @@ type PFNGLISVERTEXARRAYPROC as function(byval array as GLuint) as GLboolean
939939
declare sub glClearBufferuiv(byval buffer as GLenum, byval drawbuffer as GLint, byval value as const GLuint ptr)
940940
declare sub glClearBufferfv(byval buffer as GLenum, byval drawbuffer as GLint, byval value as const GLfloat ptr)
941941
declare sub glClearBufferfi(byval buffer as GLenum, byval drawbuffer as GLint, byval depth as GLfloat, byval stencil as GLint)
942-
declare function glGetStringi(byval name as GLenum, byval index as GLuint) as const GLubyte ptr
942+
declare function glGetStringi(byval name as GLenum, byval index as GLuint) as const zstring ptr
943943
declare function glIsRenderbuffer(byval renderbuffer as GLuint) as GLboolean
944944
declare sub glBindRenderbuffer(byval target as GLenum, byval renderbuffer as GLuint)
945945
declare sub glDeleteRenderbuffers(byval n as GLsizei, byval renderbuffers as const GLuint ptr)

inc/GL/mesa/glu.bi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ declare function gluBuild2DMipmapLevels(byval target as GLenum, byval internalFo
194194
declare function gluBuild2DMipmaps(byval target as GLenum, byval internalFormat as GLint, byval width as GLsizei, byval height as GLsizei, byval format as GLenum, byval type as GLenum, byval data as const any ptr) as GLint
195195
declare function gluBuild3DMipmapLevels(byval target as GLenum, byval internalFormat as GLint, byval width as GLsizei, byval height as GLsizei, byval depth as GLsizei, byval format as GLenum, byval type as GLenum, byval level as GLint, byval base as GLint, byval max as GLint, byval data as const any ptr) as GLint
196196
declare function gluBuild3DMipmaps(byval target as GLenum, byval internalFormat as GLint, byval width as GLsizei, byval height as GLsizei, byval depth as GLsizei, byval format as GLenum, byval type as GLenum, byval data as const any ptr) as GLint
197-
declare function gluCheckExtension(byval extName as const GLubyte ptr, byval extString as const GLubyte ptr) as GLboolean
197+
declare function gluCheckExtension(byval extName as const zstring ptr, byval extString as const zstring ptr) as GLboolean
198198
declare sub gluCylinder(byval quad as GLUquadric ptr, byval base as GLdouble, byval top as GLdouble, byval height as GLdouble, byval slices as GLint, byval stacks as GLint)
199199
declare sub gluDeleteNurbsRenderer(byval nurb as GLUnurbs ptr)
200200
declare sub gluDeleteQuadric(byval quad as GLUquadric ptr)
@@ -204,9 +204,9 @@ declare sub gluEndCurve(byval nurb as GLUnurbs ptr)
204204
declare sub gluEndPolygon(byval tess as GLUtesselator ptr)
205205
declare sub gluEndSurface(byval nurb as GLUnurbs ptr)
206206
declare sub gluEndTrim(byval nurb as GLUnurbs ptr)
207-
declare function gluErrorString(byval error as GLenum) as const GLubyte ptr
207+
declare function gluErrorString(byval error as GLenum) as const zstring ptr
208208
declare sub gluGetNurbsProperty(byval nurb as GLUnurbs ptr, byval property as GLenum, byval data as GLfloat ptr)
209-
declare function gluGetString(byval name as GLenum) as const GLubyte ptr
209+
declare function gluGetString(byval name as GLenum) as const zstring ptr
210210
declare sub gluGetTessProperty(byval tess as GLUtesselator ptr, byval which as GLenum, byval data as GLdouble ptr)
211211
declare sub gluLoadSamplingMatrices(byval nurb as GLUnurbs ptr, byval model as const GLfloat ptr, byval perspective as const GLfloat ptr, byval view as const GLint ptr)
212212
declare sub gluLookAt(byval eyeX as GLdouble, byval eyeY as GLdouble, byval eyeZ as GLdouble, byval centerX as GLdouble, byval centerY as GLdouble, byval centerZ as GLdouble, byval upX as GLdouble, byval upY as GLdouble, byval upZ as GLdouble)

inc/GL/windows/gl.bi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ declare sub glGetPixelMapuiv(byval map as GLenum, byval values as GLuint ptr)
726726
declare sub glGetPixelMapusv(byval map as GLenum, byval values as GLushort ptr)
727727
declare sub glGetPointerv(byval pname as GLenum, byval params as GLvoid ptr ptr)
728728
declare sub glGetPolygonStipple(byval mask as GLubyte ptr)
729-
declare function glGetString(byval name as GLenum) as const GLubyte ptr
729+
declare function glGetString(byval name as GLenum) as const zstring ptr
730730
declare sub glGetTexEnvfv(byval target as GLenum, byval pname as GLenum, byval params as GLfloat ptr)
731731
declare sub glGetTexEnviv(byval target as GLenum, byval pname as GLenum, byval params as GLint ptr)
732732
declare sub glGetTexGendv(byval coord as GLenum, byval pname as GLenum, byval params as GLdouble ptr)

inc/GL/windows/glext.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ type PFNGLCLEARBUFFERIVPROC as sub(byval buffer as GLenum, byval drawbuffer as G
10891089
type PFNGLCLEARBUFFERUIVPROC as sub(byval buffer as GLenum, byval drawbuffer as GLint, byval value as const GLuint ptr)
10901090
type PFNGLCLEARBUFFERFVPROC as sub(byval buffer as GLenum, byval drawbuffer as GLint, byval value as const GLfloat ptr)
10911091
type PFNGLCLEARBUFFERFIPROC as sub(byval buffer as GLenum, byval drawbuffer as GLint, byval depth as GLfloat, byval stencil as GLint)
1092-
type PFNGLGETSTRINGIPROC as function(byval name as GLenum, byval index as GLuint) as const GLubyte ptr
1092+
type PFNGLGETSTRINGIPROC as function(byval name as GLenum, byval index as GLuint) as const zstring ptr
10931093
type PFNGLISRENDERBUFFERPROC as function(byval renderbuffer as GLuint) as GLboolean
10941094
type PFNGLBINDRENDERBUFFERPROC as sub(byval target as GLenum, byval renderbuffer as GLuint)
10951095
type PFNGLDELETERENDERBUFFERSPROC as sub(byval n as GLsizei, byval renderbuffers as const GLuint ptr)
@@ -1175,7 +1175,7 @@ type PFNGLISVERTEXARRAYPROC as function(byval array as GLuint) as GLboolean
11751175
declare sub glClearBufferuiv(byval buffer as GLenum, byval drawbuffer as GLint, byval value as const GLuint ptr)
11761176
declare sub glClearBufferfv(byval buffer as GLenum, byval drawbuffer as GLint, byval value as const GLfloat ptr)
11771177
declare sub glClearBufferfi(byval buffer as GLenum, byval drawbuffer as GLint, byval depth as GLfloat, byval stencil as GLint)
1178-
declare function glGetStringi(byval name as GLenum, byval index as GLuint) as const GLubyte ptr
1178+
declare function glGetStringi(byval name as GLenum, byval index as GLuint) as const zstring ptr
11791179
declare function glIsRenderbuffer(byval renderbuffer as GLuint) as GLboolean
11801180
declare sub glBindRenderbuffer(byval target as GLenum, byval renderbuffer as GLuint)
11811181
declare sub glDeleteRenderbuffers(byval n as GLsizei, byval renderbuffers as const GLuint ptr)

inc/GL/windows/glu.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ extern "Windows"
1616
#define gluErrorStringWIN(errCode) cast(LPCWSTR, gluErrorString(errCode))
1717
#endif
1818

19-
declare function gluErrorString(byval errCode as GLenum) as const GLubyte ptr
19+
declare function gluErrorString(byval errCode as GLenum) as const zstring ptr
2020
declare function gluErrorUnicodeStringEXT(byval errCode as GLenum) as const wstring ptr
21-
declare function gluGetString(byval name as GLenum) as const GLubyte ptr
21+
declare function gluGetString(byval name as GLenum) as const zstring ptr
2222
declare sub gluOrtho2D(byval left as GLdouble, byval right as GLdouble, byval bottom as GLdouble, byval top as GLdouble)
2323
declare sub gluPerspective(byval fovy as GLdouble, byval aspect as GLdouble, byval zNear as GLdouble, byval zFar as GLdouble)
2424
declare sub gluPickMatrix(byval x as GLdouble, byval y as GLdouble, byval width as GLdouble, byval height as GLdouble, byval viewport as GLint ptr)

0 commit comments

Comments
 (0)