[Scummvm-git-logs] scummvm master -> 6e6696271e9aba126b4ad5272326fa4471a0353b

aquadran noreply at scummvm.org
Mon Dec 27 12:22:45 UTC 2021 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6e6696271e TINYGL: Cleanup function arguments


Commit: 6e6696271e9aba126b4ad5272326fa4471a0353b
    https://github.com/scummvm/scummvm/commit/6e6696271e9aba126b4ad5272326fa4471a0353b
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-27T13:22:38+01:00

Commit Message:
TINYGL: Cleanup function arguments

Changed paths:
    graphics/tinygl/api.cpp
    graphics/tinygl/get.cpp
    graphics/tinygl/gl.h
    graphics/tinygl/list.cpp
    graphics/tinygl/select.cpp
    graphics/tinygl/texture.cpp
    graphics/tinygl/tinygl.h


diff --git a/graphics/tinygl/api.cpp b/graphics/tinygl/api.cpp
index a52bd99b9a7..d1eac0dd7ad 100644
--- a/graphics/tinygl/api.cpp
+++ b/graphics/tinygl/api.cpp
@@ -29,7 +29,7 @@
 
 // glVertex
 
-void tglVertex4f(float x, float y, float z, float w) {
+void tglVertex4f(TGLfloat x, TGLfloat y, TGLfloat z, TGLfloat w) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[5];
 
@@ -42,21 +42,21 @@ void tglVertex4f(float x, float y, float z, float w) {
 	c->gl_add_op(p);
 }
 
-void tglVertex2f(float x, float y)  {
+void tglVertex2f(TGLfloat x, TGLfloat y)  {
 	tglVertex4f(x, y, 0, 1);
 }
 
-void tglVertex3f(float x, float y, float z)  {
+void tglVertex3f(TGLfloat x, TGLfloat y, TGLfloat z)  {
 	tglVertex4f(x, y, z, 1);
 }
 
-void tglVertex3fv(const float *v)  {
+void tglVertex3fv(const TGLfloat *v)  {
 	tglVertex4f(v[0], v[1], v[2], 1);
 }
 
 // glNormal
 
-void tglNormal3f(float x, float y, float z) {
+void tglNormal3f(TGLfloat x, TGLfloat y, TGLfloat z) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[4];
 
@@ -68,13 +68,13 @@ void tglNormal3f(float x, float y, float z) {
 	c->gl_add_op(p);
 }
 
-void tglNormal3fv(const float *v)  {
+void tglNormal3fv(const TGLfloat *v)  {
 	tglNormal3f(v[0], v[1], v[2]);
 }
 
 // glColor
 
-void tglColor4f(float r, float g, float b, float a) {
+void tglColor4f(TGLfloat r, TGLfloat g, TGLfloat b, TGLfloat a) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[9];
 
@@ -86,29 +86,29 @@ void tglColor4f(float r, float g, float b, float a) {
 	c->gl_add_op(p);
 }
 
-void tglColor4fv(const float *v) {
+void tglColor4fv(const TGLfloat *v) {
 	tglColor4f(v[0], v[1], v[2], v[3]);
 }
 
-void tglColor3f(float x, float y, float z) {
+void tglColor3f(TGLfloat x, TGLfloat y, TGLfloat z) {
 	tglColor4f(x, y, z, 1);
 }
 
-void tglColor3fv(const float *v)  {
+void tglColor3fv(const TGLfloat *v)  {
 	tglColor4f(v[0], v[1], v[2], 1);
 }
 
-void tglColor3ub(unsigned char r, unsigned char g, unsigned char b) {
+void tglColor3ub(TGLubyte r, TGLubyte g, TGLubyte b) {
 	tglColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
 }
 
-void tglColor4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a) {
+void tglColor4ub(TGLubyte r, TGLubyte g, TGLubyte b, TGLubyte a) {
 	tglColor4f(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f);
 }
 
 // TexCoord
 
-void tglTexCoord4f(float s, float t, float r, float q) {
+void tglTexCoord4f(TGLfloat s, TGLfloat t, TGLfloat r, TGLfloat q) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[5];
 
@@ -121,47 +121,47 @@ void tglTexCoord4f(float s, float t, float r, float q) {
 	c->gl_add_op(p);
 }
 
-void tglTexCoord3f(float s, float t, float q) {
+void tglTexCoord3f(TGLfloat s, TGLfloat t, TGLfloat q) {
 	tglTexCoord4f(s, t, q, 1);
 }
 
-void tglTexCoord2f(float s, float t) {
+void tglTexCoord2f(TGLfloat s, TGLfloat t) {
 	tglTexCoord4f(s, t, 0, 1);
 }
 
-void tglTexCoord1f(float s) {
+void tglTexCoord1f(TGLfloat s) {
 	tglTexCoord4f(s, 0, 0, 1);
 }
 
-void tglTexCoord4fv(const float *v) {
+void tglTexCoord4fv(const TGLfloat *v) {
 	tglTexCoord4f(v[0], v[1], v[2], v[3]);
 }
 
-void tglTexCoord3fv(const float *v) {
+void tglTexCoord3fv(const TGLfloat *v) {
 	tglTexCoord4f(v[0], v[1], v[2], 1);
 }
 
-void tglTexCoord2fv(const float *v) {
+void tglTexCoord2fv(const TGLfloat *v) {
 	tglTexCoord4f(v[0], v[1], 0, 1);
 }
 
-void tglTexCoord1fv(const float *v) {
+void tglTexCoord1fv(const TGLfloat *v) {
 	tglTexCoord4f(v[0], 0, 0, 1);
 }
 
 // misc
 
-void tglEdgeFlag(int flag) {
+void tglEdgeFlag(TGLboolean flag) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
 	p[0].op = TinyGL::OP_EdgeFlag;
-	p[1].i = flag;
+	p[1].i = flag == TGL_TRUE ? 1 : 0;;
 
 	c->gl_add_op(p);
 }
 
-void tglShadeModel(int mode) {
+void tglShadeModel(TGLenum mode) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -173,7 +173,7 @@ void tglShadeModel(int mode) {
 	c->gl_add_op(p);
 }
 
-void tglCullFace(int mode) {
+void tglCullFace(TGLenum mode) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -185,7 +185,7 @@ void tglCullFace(int mode) {
 	c->gl_add_op(p);
 }
 
-void tglFrontFace(int mode) {
+void tglFrontFace(TGLenum mode) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -204,19 +204,19 @@ void tglColorMask(TGLboolean r, TGLboolean g, TGLboolean b, TGLboolean a) {
 	TinyGL::GLParam p[5];
 
 	p[0].op = TinyGL::OP_ColorMask;
-	p[1].i = r;
-	p[2].i = g;
-	p[3].i = b;
-	p[4].i = a;
+	p[1].i = r == TGL_TRUE ? 1 : 0;
+	p[2].i = g == TGL_TRUE ? 1 : 0;
+	p[3].i = b == TGL_TRUE ? 1 : 0;
+	p[4].i = a == TGL_TRUE ? 1 : 0;;
 
 	c->gl_add_op(p);
 }
 
-void tglDepthMask(int enableWrite) {
+void tglDepthMask(TGLboolean flag) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 	p[0].op = TinyGL::OP_DepthMask;
-	p[1].i = enableWrite;
+	p[1].i = flag == TGL_TRUE ? 1 : 0;
 
 	c->gl_add_op(p);
 }
@@ -241,7 +241,7 @@ void tglBlendFunc(TGLenum sfactor, TGLenum dfactor) {
 	c->gl_add_op(p);
 }
 
-void tglAlphaFunc(TGLenum func, float ref) {
+void tglAlphaFunc(TGLenum func, TGLclampf ref) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[3];
 
@@ -283,7 +283,7 @@ void tglStencilOp(TGLenum sfail, TGLenum dpfail, TGLenum dppass) {
 	c->gl_add_op(p);
 }
 
-void tglPolygonMode(int face, int mode) {
+void tglPolygonMode(TGLenum face, TGLenum mode) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[3];
 
@@ -299,7 +299,7 @@ void tglPolygonMode(int face, int mode) {
 
 // glEnable, glDisable
 
-void tglEnable(int cap) {
+void tglEnable(TGLenum cap) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[3];
 
@@ -310,7 +310,7 @@ void tglEnable(int cap) {
 	c->gl_add_op(p);
 }
 
-void tglDisable(int cap) {
+void tglDisable(TGLenum cap) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[3];
 
@@ -323,7 +323,7 @@ void tglDisable(int cap) {
 
 // glBegin, glEnd
 
-void tglBegin(int mode) {
+void tglBegin(TGLenum mode) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -344,7 +344,7 @@ void tglEnd() {
 
 // matrix
 
-void tglMatrixMode(int mode) {
+void tglMatrixMode(TGLenum mode) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -354,7 +354,7 @@ void tglMatrixMode(int mode) {
 	c->gl_add_op(p);
 }
 
-void tglLoadMatrixf(const float *m) {
+void tglLoadMatrixf(const TGLfloat *m) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[17];
 
@@ -374,7 +374,7 @@ void tglLoadIdentity() {
 	c->gl_add_op(p);
 }
 
-void tglMultMatrixf(const float *m) {
+void tglMultMatrixf(const TGLfloat *m) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[17];
 
@@ -403,7 +403,7 @@ void tglPopMatrix() {
 	c->gl_add_op(p);
 }
 
-void tglRotatef(float angle, float x, float y, float z) {
+void tglRotatef(TGLfloat angle, TGLfloat x, TGLfloat y, TGLfloat z) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[5];
 
@@ -416,7 +416,7 @@ void tglRotatef(float angle, float x, float y, float z) {
 	c->gl_add_op(p);
 }
 
-void tglTranslatef(float x, float y, float z) {
+void tglTranslatef(TGLfloat x, TGLfloat y, TGLfloat z) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[4];
 
@@ -428,7 +428,7 @@ void tglTranslatef(float x, float y, float z) {
 	c->gl_add_op(p);
 }
 
-void tglScalef(float x, float y, float z) {
+void tglScalef(TGLfloat x, TGLfloat y, TGLfloat z) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[4];
 
@@ -440,7 +440,7 @@ void tglScalef(float x, float y, float z) {
 	c->gl_add_op(p);
 }
 
-void tglViewport(int x, int y, int width, int height) {
+void tglViewport(TGLint x, TGLint y, TGLsizei width, TGLsizei height) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[5];
 
@@ -453,7 +453,7 @@ void tglViewport(int x, int y, int width, int height) {
 	c->gl_add_op(p);
 }
 
-void tglFrustum(double left, double right, double bottom, double top, double nearv, double farv) {
+void tglFrustum(TGLdouble left, TGLdouble right, TGLdouble bottom, TGLdouble top, TGLdouble nearv, TGLdouble farv) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[7];
 
@@ -468,7 +468,7 @@ void tglFrustum(double left, double right, double bottom, double top, double nea
 	c->gl_add_op(p);
 }
 
-void tglOrtho(double left, double right, double bottom, double top, double zNear, double zFar) {
+void tglOrtho(TGLdouble left, TGLdouble right, TGLdouble bottom, TGLdouble top, TGLdouble zNear, TGLdouble zFar) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[7];
 
@@ -485,7 +485,7 @@ void tglOrtho(double left, double right, double bottom, double top, double zNear
 
 // lightening
 
-void tglMaterialfv(int mode, int type, const float *v) {
+void tglMaterialfv(TGLenum mode, TGLenum type, const TGLfloat *v) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[7];
 	int n;
@@ -506,7 +506,7 @@ void tglMaterialfv(int mode, int type, const float *v) {
 	c->gl_add_op(p);
 }
 
-void tglMaterialf(int mode, int type, float v) {
+void tglMaterialf(TGLenum mode, TGLenum type, TGLfloat v) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[7];
 
@@ -520,7 +520,7 @@ void tglMaterialf(int mode, int type, float v) {
 	c->gl_add_op(p);
 }
 
-void tglColorMaterial(int mode, int type) {
+void tglColorMaterial(TGLenum mode, TGLenum type) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[3];
 
@@ -531,7 +531,7 @@ void tglColorMaterial(int mode, int type) {
 	c->gl_add_op(p);
 }
 
-void tglLightfv(int light, int type, const float *v) {
+void tglLightfv(TGLenum light, TGLenum type, const TGLfloat *v) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[7];
 
@@ -548,7 +548,7 @@ void tglLightfv(int light, int type, const float *v) {
 	c->gl_add_op(p);
 }
 
-void tglLightf(int light, int type, float v) {
+void tglLightf(TGLenum light, TGLenum type, TGLfloat v) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[7];
 
@@ -562,7 +562,7 @@ void tglLightf(int light, int type, float v) {
 	c->gl_add_op(p);
 }
 
-void tglLightModeli(int pname, int param) {
+void tglLightModeli(TGLenum pname, TGLint param) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[6];
 
@@ -575,7 +575,7 @@ void tglLightModeli(int pname, int param) {
 	c->gl_add_op(p);
 }
 
-void tglLightModelfv(int pname, const float *param) {
+void tglLightModelfv(TGLenum pname, const TGLfloat *param) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[6];
 
@@ -589,7 +589,7 @@ void tglLightModelfv(int pname, const float *param) {
 
 // clear
 
-void tglClear(int mask) {
+void tglClear(TGLbitfield mask) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -599,7 +599,7 @@ void tglClear(int mask) {
 	c->gl_add_op(p);
 }
 
-void tglClearColor(float r, float g, float b, float a) {
+void tglClearColor(TGLfloat r, TGLfloat g, TGLfloat b, TGLfloat a) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[5];
 
@@ -612,7 +612,7 @@ void tglClearColor(float r, float g, float b, float a) {
 	c->gl_add_op(p);
 }
 
-void tglClearDepth(double depth) {
+void tglClearDepth(TGLdouble depth) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -634,25 +634,26 @@ void tglClearStencil(TGLint s) {
 
 // textures
 
-void tglTexImage2D(int target, int level, int components, int width, int height, int border, int format, int type, void *pixels) {
+void tglTexImage2D(TGLenum target, TGLint level, TGLint internalformat, TGLsizei width,
+	           TGLsizei height, TGLint border, TGLenum format, TGLenum type, const void *pixels) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[10];
 
 	p[0].op = TinyGL::OP_TexImage2D;
 	p[1].i = target;
 	p[2].i = level;
-	p[3].i = components;
+	p[3].i = internalformat;
 	p[4].i = width;
 	p[5].i = height;
 	p[6].i = border;
 	p[7].i = format;
 	p[8].i = type;
-	p[9].p = pixels;
+	p[9].p = const_cast<void *>(pixels);
 
 	c->gl_add_op(p);
 }
 
-void tglBindTexture(int target, int texture) {
+void tglBindTexture(TGLenum target, TGLuint texture) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[3];
 
@@ -663,7 +664,7 @@ void tglBindTexture(int target, int texture) {
 	c->gl_add_op(p);
 }
 
-void tglTexEnvi(int target, int pname, int param) {
+void tglTexEnvi(TGLenum target, TGLenum pname, TGLint param) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[8];
 
@@ -679,7 +680,7 @@ void tglTexEnvi(int target, int pname, int param) {
 	c->gl_add_op(p);
 }
 
-void tglTexParameteri(int target, int pname, int param) {
+void tglTexParameteri(TGLenum target, TGLenum pname, TGLint param) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[8];
 
@@ -695,7 +696,7 @@ void tglTexParameteri(int target, int pname, int param) {
 	c->gl_add_op(p);
 }
 
-void tglPixelStorei(int pname, int param) {
+void tglPixelStorei(TGLenum pname, TGLint param) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[3];
 
@@ -717,7 +718,7 @@ void tglInitNames() {
 	c->gl_add_op(p);
 }
 
-void tglPushName(uint name) {
+void tglPushName(TGLuint name) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -736,7 +737,7 @@ void tglPopName() {
 	c->gl_add_op(p);
 }
 
-void tglLoadName(uint name) {
+void tglLoadName(TGLuint name) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -759,7 +760,7 @@ void tglPolygonOffset(TGLfloat factor, TGLfloat units) {
 
 // Special Functions
 
-void tglCallList(uint list) {
+void tglCallList(TGLuint list) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[2];
 
@@ -773,7 +774,7 @@ void tglFlush() {
 	// nothing to do
 }
 
-void tglHint(int target, int mode) {
+void tglHint(TGLenum target, TGLenum mode) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLParam p[3];
 
@@ -786,7 +787,7 @@ void tglHint(int target, int mode) {
 
 // Non standard functions
 
-void tglDebug(int mode) {
+void tglDebug(TGLenum mode) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	c->print_flag = mode;
 }
diff --git a/graphics/tinygl/get.cpp b/graphics/tinygl/get.cpp
index 0bbbc8df5cc..f8360c3b3d1 100644
--- a/graphics/tinygl/get.cpp
+++ b/graphics/tinygl/get.cpp
@@ -30,42 +30,42 @@
 
 #include "graphics/tinygl/zgl.h"
 
-void tglGetIntegerv(int pname, int *params) {
+void tglGetIntegerv(TGLenum pname, TGLint *data) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 
 	switch (pname) {
 	case TGL_VIEWPORT:
-		params[0] = c->viewport.xmin;
-		params[1] = c->viewport.ymin;
-		params[2] = c->viewport.xsize;
-		params[3] = c->viewport.ysize;
+		data[0] = c->viewport.xmin;
+		data[1] = c->viewport.ymin;
+		data[2] = c->viewport.xsize;
+		data[3] = c->viewport.ysize;
 		break;
 	case TGL_MAX_MODELVIEW_STACK_DEPTH:
-		*params = MAX_MODELVIEW_STACK_DEPTH;
+		*data = MAX_MODELVIEW_STACK_DEPTH;
 		break;
 	case TGL_MAX_PROJECTION_STACK_DEPTH:
-		*params = MAX_PROJECTION_STACK_DEPTH;
+		*data = MAX_PROJECTION_STACK_DEPTH;
 		break;
 	case TGL_MAX_LIGHTS:
-		*params = T_MAX_LIGHTS;
+		*data = T_MAX_LIGHTS;
 		break;
 	case TGL_MAX_TEXTURE_SIZE:
-		*params = c->_textureSize;
+		*data = c->_textureSize;
 		break;
 	case TGL_MAX_TEXTURE_STACK_DEPTH:
-		*params = MAX_TEXTURE_STACK_DEPTH;
+		*data = MAX_TEXTURE_STACK_DEPTH;
 		break;
 	case TGL_BLEND:
-		*params = c->blending_enabled;
+		*data = c->blending_enabled;
 		break;
 	case TGL_ALPHA_TEST:
-		*params = c->alpha_test_enabled;
+		*data = c->alpha_test_enabled;
 		break;
 	case TGL_DEPTH_TEST:
-		*params = c->depth_test_enabled;
+		*data = c->depth_test_enabled;
 		break;
 	case TGL_STENCIL_TEST:
-		*params = c->stencil_test_enabled;
+		*data = c->stencil_test_enabled;
 		break;
 	default:
 		error("tglGet: option not implemented");
@@ -73,9 +73,8 @@ void tglGetIntegerv(int pname, int *params) {
 	}
 }
 
-void tglGetFloatv(int pname, float *v) {
-	int i;
-	int mnr = 0; // just a trick to return the correct matrix
+void tglGetFloatv(TGLenum pname, TGLfloat *data) {
+	int i, mnr = 0; // just a trick to return the correct matrix
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	switch (pname) {
 	case TGL_TEXTURE_MATRIX:
@@ -87,25 +86,25 @@ void tglGetFloatv(int pname, float *v) {
 	case TGL_MODELVIEW_MATRIX: {
 		float *p = &c->matrix_stack_ptr[mnr]->_m[0][0];
 		for (i = 0; i < 4; i++) {
-			*v++ = p[0];
-			*v++ = p[4];
-			*v++ = p[8];
-			*v++ = p[12];
+			*data++ = p[0];
+			*data++ = p[4];
+			*data++ = p[8];
+			*data++ = p[12];
 			p++;
 		}
 	}
 	break;
 	case TGL_LINE_WIDTH:
-		*v = 1.0f;
+		*data = 1.0f;
 		break;
 	case TGL_LINE_WIDTH_RANGE:
-		v[0] = v[1] = 1.0f;
+		data[0] = data[1] = 1.0f;
 		break;
 	case TGL_POINT_SIZE:
-		*v = 1.0f;
+		*data = 1.0f;
 		break;
 	case TGL_POINT_SIZE_RANGE:
-		v[0] = v[1] = 1.0f;
+		data[0] = data[1] = 1.0f;
 		break;
 	default:
 		fprintf(stderr, "warning: unknown pname in glGetFloatv()\n");
diff --git a/graphics/tinygl/gl.h b/graphics/tinygl/gl.h
index 0b5c46b3e42..5e8c66481ea 100644
--- a/graphics/tinygl/gl.h
+++ b/graphics/tinygl/gl.h
@@ -708,42 +708,45 @@ typedef unsigned int    TGLuint;    // 4-byte unsigned
 typedef float           TGLfloat;   // single precision float
 typedef double          TGLdouble;  // double precision float
 typedef int             TGLsizei;
+typedef unsigned int    TGLbitfield;
+typedef float           TGLclampf;
+typedef double          TGLclampd;
 
 // functions
 
-void tglEnable(int code);
-void tglDisable(int code);
+void tglEnable(TGLenum code);
+void tglDisable(TGLenum code);
 
-void tglShadeModel(int mode);
-void tglCullFace(int mode);
-void tglPolygonMode(int face, int mode);
+void tglShadeModel(TGLenum mode);
+void tglCullFace(TGLenum mode);
+void tglPolygonMode(TGLenum face, TGLenum mode);
 
-void tglBegin(int type);
+void tglBegin(TGLenum type);
 void tglEnd();
 
 #define PROTO_GL1(name)                   \
-void tgl ## name ## 1f(float);            \
-void tgl ## name ## 1d(double);           \
-void tgl ## name ## 1fv(const float *);   \
-void tgl ## name ## 1dv(const double *);
+void tgl ## name ## 1f(TGLfloat);            \
+void tgl ## name ## 1d(TGLdouble);           \
+void tgl ## name ## 1fv(const TGLfloat *);   \
+void tgl ## name ## 1dv(const TGLdouble *);
 
 #define PROTO_GL2(name)                   \
-void tgl ## name ## 2f(float, float);     \
-void tgl ## name ## 2d(double, double);   \
-void tgl ## name ## 2fv(const float *);   \
-void tgl ## name ## 2dv(const double *);
+void tgl ## name ## 2f(TGLfloat, TGLfloat);     \
+void tgl ## name ## 2d(TGLdouble, TGLdouble);   \
+void tgl ## name ## 2fv(const TGLfloat *);   \
+void tgl ## name ## 2dv(const TGLdouble *);
 
 #define PROTO_GL3(name)                         \
-void tgl ## name ## 3f(float, float, float);    \
-void tgl ## name ## 3d(double, double, double); \
-void tgl ## name ## 3fv(const float *);         \
-void tgl ## name ## 3dv(const double *);
+void tgl ## name ## 3f(TGLfloat, TGLfloat, TGLfloat);    \
+void tgl ## name ## 3d(TGLdouble, TGLdouble, TGLdouble); \
+void tgl ## name ## 3fv(const TGLfloat *);         \
+void tgl ## name ## 3dv(const TGLdouble *);
 
 #define PROTO_GL4(name)                                 \
-void tgl ## name ## 4f(float, float, float, float);     \
-void tgl ## name ## 4d(double, double, double, double); \
-void tgl ## name ## 4fv(const float *);                 \
-void tgl ## name ## 4dv(const double *);
+void tgl ## name ## 4f(TGLfloat, TGLfloat, TGLfloat, TGLfloat);     \
+void tgl ## name ## 4d(TGLdouble, TGLdouble, TGLdouble, TGLdouble); \
+void tgl ## name ## 4fv(const TGLfloat *);                 \
+void tgl ## name ## 4dv(const TGLdouble *);
 
 PROTO_GL2(Vertex)
 PROTO_GL3(Vertex)
@@ -751,9 +754,8 @@ PROTO_GL4(Vertex)
 
 PROTO_GL3(Color)
 PROTO_GL4(Color)
-void tglColor3ub(unsigned char r, unsigned char g, unsigned char b);
-void tglColor4ub(unsigned char r, unsigned char g, unsigned char b,
-                 unsigned char a);
+void tglColor3ub(TGLubyte r, TGLubyte g, TGLubyte b);
+void tglColor4ub(TGLubyte r, TGLubyte g, TGLubyte b, TGLubyte a);
 
 PROTO_GL3(Normal)
 
@@ -762,35 +764,36 @@ PROTO_GL2(TexCoord)
 PROTO_GL3(TexCoord)
 PROTO_GL4(TexCoord)
 
-void tglEdgeFlag(int flag);
+void tglEdgeFlag(TGLboolean flag);
 
 // matrix
-void tglMatrixMode(int mode);
-void tglLoadMatrixf(const float *m);
+void tglMatrixMode(TGLenum mode);
+void tglLoadMatrixf(const TGLfloat *m);
 void tglLoadIdentity();
-void tglMultMatrixf(const float *m);
+void tglMultMatrixf(const TGLfloat *m);
 void tglPushMatrix();
 void tglPopMatrix();
-void tglRotatef(float angle, float x, float y, float z);
-void tglTranslatef(float x, float y, float z);
-void tglScalef(float x, float y, float z);
+void tglRotatef(TGLfloat angle, TGLfloat x, TGLfloat y, TGLfloat z);
+void tglTranslatef(TGLfloat x, TGLfloat y, TGLfloat z);
+void tglScalef(TGLfloat x, TGLfloat y, TGLfloat z);
 
-void tglViewport(int x, int y, int width, int height);
-void tglFrustum(double left, double right, double bottom, double top,
-                double nearv, double farv);
-void tglOrtho(double left, double right, double bottom, double top, double zNear, double zFar);
+void tglViewport(TGLint x, TGLint y, TGLsizei width, TGLsizei height);
+void tglFrustum(TGLdouble left, TGLdouble right, TGLdouble bottom, TGLdouble top,
+                TGLdouble nearv, TGLdouble farv);
+void tglOrtho(TGLdouble left, TGLdouble right, TGLdouble bottom, TGLdouble top,
+              TGLdouble zNear, TGLdouble zFar);
 
 // lists
-unsigned int tglGenLists(int range);
-int tglIsList(unsigned int list);
-void tglNewList(unsigned int list, int mode);
+TGLuint tglGenLists(TGLsizei range);
+TGLboolean tglIsList(TGLuint list);
+void tglNewList(TGLuint list, TGLenum mode);
 void tglEndList();
-void tglCallList(unsigned int list);
+void tglCallList(TGLuint list);
 
 // clear
-void tglClear(int mask);
-void tglClearColor(float r, float g, float b, float a);
-void tglClearDepth(double depth);
+void tglClear(TGLbitfield mask);
+void tglClearColor(TGLfloat r, TGLfloat g, TGLfloat b, TGLfloat a);
+void tglClearDepth(TGLdouble depth);
 void tglClearStencil(TGLint s);
 
 // stencil buffer
@@ -799,47 +802,47 @@ void tglStencilOp(TGLenum sfail, TGLenum dpfail, TGLenum dppass);
 void tglStencilMask(TGLuint mask);
 
 // selection
-int tglRenderMode(int mode);
-void tglSelectBuffer(int size, unsigned int *buf);
+int tglRenderMode(TGLenum mode);
+void tglSelectBuffer(TGLsizei size, TGLuint *buffer);
 
 void tglInitNames();
-void tglPushName(unsigned int name);
+void tglPushName(TGLuint name);
 void tglPopName();
-void tglLoadName(unsigned int name);
+void tglLoadName(TGLuint name);
 
 // textures
-void tglGenTextures(int n, unsigned int *textures);
-void tglDeleteTextures(int n, const unsigned int *textures);
-void tglBindTexture(int target, int texture);
-void tglTexImage2D(int target, int level, int components,
-                   int width, int height, int border,
-                   int format, int type, void *pixels);
-void tglTexEnvi(int target, int pname, int param);
-void tglTexParameteri(int target, int pname, int param);
-void tglPixelStorei(int pname, int param);
+void tglGenTextures(TGLsizei n, TGLuint *textures);
+void tglDeleteTextures(TGLsizei n, const TGLuint *textures);
+void tglBindTexture(TGLenum target, TGLuint texture);
+void tglTexImage2D(TGLenum target, TGLint level, TGLint internalformat,
+                   TGLsizei width, TGLsizei height, TGLint border,
+                   TGLenum format, TGLenum type, const void *pixels);
+void tglTexEnvi(TGLenum target, TGLenum pname, TGLint param);
+void tglTexParameteri(TGLenum target, TGLenum pname, TGLint param);
+void tglPixelStorei(TGLenum pname, TGLint param);
 
 // lighting
 
-void tglMaterialfv(int mode, int type, const float *v);
-void tglMaterialf(int mode, int type, float v);
-void tglColorMaterial(int mode, int type);
+void tglMaterialfv(TGLenum mode, TGLenum type, const TGLfloat *v);
+void tglMaterialf(TGLenum mode, TGLenum type, TGLfloat v);
+void tglColorMaterial(TGLenum mode, TGLenum type);
 
-void tglLightfv(int light, int type, const float *v);
-void tglLightf(int light, int type, const float v);
-void tglLightModeli(int pname, int param);
-void tglLightModelfv(int pname, const float *param);
+void tglLightfv(TGLenum light, TGLenum type, const TGLfloat *v);
+void tglLightf(TGLenum light, TGLenum type, const TGLfloat v);
+void tglLightModeli(TGLenum pname, TGLint param);
+void tglLightModelfv(TGLenum pname, const TGLfloat *param);
 
 // misc
 
 void tglFlush();
-void tglHint(int target, int mode);
-void tglGetIntegerv(int pname, int *params);
-void tglGetFloatv(int pname, float *v);
-void tglFrontFace(int mode);
+void tglHint(TGLenum target, TGLenum mode);
+void tglGetIntegerv(TGLenum pname, TGLint *data);
+void tglGetFloatv(TGLenum pname, TGLfloat *data);
+void tglFrontFace(TGLenum mode);
 void tglColorMask(TGLboolean r, TGLboolean g, TGLboolean b, TGLboolean a);
-void tglDepthMask(int enableWrite);
+void tglDepthMask(TGLboolean flag);
 void tglBlendFunc(TGLenum sfactor, TGLenum dfactor);
-void tglAlphaFunc(TGLenum func, float ref);
+void tglAlphaFunc(TGLenum func, TGLclampf ref);
 void tglDepthFunc(TGLenum func);
 
 // arrays
@@ -857,6 +860,6 @@ void tglTexCoordPointer(TGLint size, TGLenum type, TGLsizei stride, const TGLvoi
 void tglPolygonOffset(TGLfloat factor, TGLfloat units);
 
 // custom extensions
-void tglDebug(int mode);
+void tglDebug(TGLenum mode);
 
 #endif
diff --git a/graphics/tinygl/list.cpp b/graphics/tinygl/list.cpp
index 7be35cd17b3..0a00ad44732 100644
--- a/graphics/tinygl/list.cpp
+++ b/graphics/tinygl/list.cpp
@@ -205,7 +205,7 @@ void GLContext::glopCallList(GLParam *p) {
 	}
 }
 
-void tglNewList(uint list, int mode) {
+void tglNewList(TGLuint list, TGLenum mode) {
 	GLList *l;
 	GLContext *c = gl_get_context();
 
@@ -238,14 +238,14 @@ void tglEndList() {
 	c->exec_flag = 1;
 }
 
-int tglIsList(uint list) {
+TGLboolean tglIsList(TGLuint list) {
 	GLContext *c = gl_get_context();
 	GLList *l = find_list(c, list);
 
-	return (l != NULL);
+	return (l != nullptr);
 }
 
-unsigned int tglGenLists(int range) {
+TGLuint tglGenLists(TGLsizei range) {
 	GLContext *c = gl_get_context();
 	int count, list;
 	GLList **lists;
diff --git a/graphics/tinygl/select.cpp b/graphics/tinygl/select.cpp
index bdad098665f..0d040ee003f 100644
--- a/graphics/tinygl/select.cpp
+++ b/graphics/tinygl/select.cpp
@@ -29,7 +29,7 @@
 
 namespace TinyGL {
 
-int tglRenderMode(int mode) {
+TGLint tglRenderMode(TGLenum mode) {
 	GLContext *c = gl_get_context();
 	int result = 0;
 
@@ -67,12 +67,12 @@ int tglRenderMode(int mode) {
 	return result;
 }
 
-void tglSelectBuffer(int size, uint *buf) {
+void tglSelectBuffer(TGLsizei size, TGLuint *buffer) {
 	GLContext *c = gl_get_context();
 
 	assert(c->render_mode != TGL_SELECT);
 
-	c->select_buffer = buf;
+	c->select_buffer = buffer;
 	c->select_size = size;
 }
 
diff --git a/graphics/tinygl/texture.cpp b/graphics/tinygl/texture.cpp
index af848eb2e39..79272332d6b 100644
--- a/graphics/tinygl/texture.cpp
+++ b/graphics/tinygl/texture.cpp
@@ -288,7 +288,7 @@ void GLContext::glopPixelStore(GLParam *p) {
 
 } // end of namespace TinyGL
 
-void tglGenTextures(int n, uint *textures) {
+void tglGenTextures(TGLsizei n, TGLuint *textures) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 
 	for (int i = 0; i < n; i++) {
@@ -297,7 +297,7 @@ void tglGenTextures(int n, uint *textures) {
 	c->maxTextureName += n;
 }
 
-void tglDeleteTextures(int n, const uint *textures) {
+void tglDeleteTextures(TGLsizei n, const TGLuint *textures) {
 	TinyGL::GLContext *c = TinyGL::gl_get_context();
 	TinyGL::GLTexture *t;
 
diff --git a/graphics/tinygl/tinygl.h b/graphics/tinygl/tinygl.h
index 4cfd42817b5..bb95620e6e8 100644
--- a/graphics/tinygl/tinygl.h
+++ b/graphics/tinygl/tinygl.h
@@ -29,7 +29,8 @@
 
 namespace TinyGL {
 
-void createContext(int screenW, int screenH, Graphics::PixelFormat pixelFormat, int textureSize, bool enableStencilBuffer, bool dirtyRectsEnable = true);
+void createContext(int screenW, int screenH, Graphics::PixelFormat pixelFormat,
+                   int textureSize, bool enableStencilBuffer, bool dirtyRectsEnable = true);
 void destroyContext();
 void presentBuffer();
 void presentBuffer(Common::List<Common::Rect> &dirtyAreas);

More information about the Scummvm-git-logs mailing list