From c73a96c1a59c6817c588ceb93fb14a3a071764de Mon Sep 17 00:00:00 2001 From: Luke Benstead Date: Mon, 11 Mar 2019 19:36:07 +0000 Subject: [PATCH 1/3] Fix some more invalid GL constants --- include/gl.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/gl.h b/include/gl.h index 5828171..5a80a5d 100644 --- a/include/gl.h +++ b/include/gl.h @@ -104,9 +104,6 @@ __BEGIN_DECLS #define GL_TEXTURE_WRAP_T 0x2803 #define GL_TEXTURE_MAG_FILTER 0x2800 #define GL_TEXTURE_MIN_FILTER 0x2801 -#define GL_TEXTURE_FILTER GL_TEXTURE_MIN_FILTER -#define GL_FILTER_NONE 0x0 -#define GL_FILTER_BILINEAR 0x1 #define GL_REPEAT 0x2901 #define GL_CLAMP 0x2900 @@ -382,9 +379,9 @@ __BEGIN_DECLS #define GL_TRUE 1 /* Stubs for portability */ -#define GL_ALPHA_TEST 0 -#define GL_STENCIL_TEST 0 -#define GL_UNPACK_ALIGNMENT 0 +#define GL_ALPHA_TEST 0x0BC0 +#define GL_STENCIL_TEST 0x0B90 +#define GL_UNPACK_ALIGNMENT 0x0CF5 #define GLAPI extern #define APIENTRY From 70ceb70f0bdbef58f4616ac0374ebaee64b37f78 Mon Sep 17 00:00:00 2001 From: Luke Benstead Date: Mon, 11 Mar 2019 19:51:13 +0000 Subject: [PATCH 2/3] Fix invalid filter param --- samples/multitexture_arrays/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/multitexture_arrays/main.c b/samples/multitexture_arrays/main.c index e235022..27b57cf 100644 --- a/samples/multitexture_arrays/main.c +++ b/samples/multitexture_arrays/main.c @@ -46,13 +46,13 @@ void RenderCallback(GLuint texID0, GLuint texID1) { glActiveTextureARB(GL_TEXTURE0_ARB); glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, texID0); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); /* Bind multi-texture to GL_TEXTURE1_ARB and set texture parameters */ glActiveTextureARB(GL_TEXTURE1_ARB); glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, texID1); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); /* Set Blending Mode */ From 2ad23b1e166cd447f2caf6d587ed89310d3b8fa0 Mon Sep 17 00:00:00 2001 From: Luke Benstead Date: Mon, 11 Mar 2019 19:54:55 +0000 Subject: [PATCH 3/3] Update version string --- GL/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GL/state.c b/GL/state.c index 12d2cc5..9a43f2d 100644 --- a/GL/state.c +++ b/GL/state.c @@ -671,7 +671,7 @@ const GLbyte *glGetString(GLenum name) { return "PowerVR2 CLX2 100mHz"; case GL_VERSION: - return "GLdc 1.x"; + return "1.2 (partial) - GLdc 1.0"; case GL_EXTENSIONS: return "GL_ARB_framebuffer_object, GL_ARB_multitexture, GL_ARB_texture_rg, GL_EXT_paletted_texture, GL_EXT_shared_texture_palette, GL_KOS_multiple_shared_palette";