mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:simulant/GLdc

Browse Source
This commit is contained in:
Hayden Kowalchuk 2019-03-11 18:07:26 -04:00
commit 6cce79cfe6
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GL/state.c
View File

@ -671,7 +671,7 @@ const GLbyte *glGetString(GLenum name) {
return "PowerVR2 CLX2 100mHz"; return "PowerVR2 CLX2 100mHz";
case GL_VERSION: case GL_VERSION:
return "GLdc 1.x"; return "1.2 (partial) - GLdc 1.0";
case GL_EXTENSIONS: 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"; 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";

9
include/gl.h
View File

@ -104,9 +104,6 @@ __BEGIN_DECLS
#define GL_TEXTURE_WRAP_T 0x2803 #define GL_TEXTURE_WRAP_T 0x2803
#define GL_TEXTURE_MAG_FILTER 0x2800 #define GL_TEXTURE_MAG_FILTER 0x2800
#define GL_TEXTURE_MIN_FILTER 0x2801 #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_REPEAT 0x2901
#define GL_CLAMP 0x2900 #define GL_CLAMP 0x2900
@ -382,9 +379,9 @@ __BEGIN_DECLS
#define GL_TRUE 1 #define GL_TRUE 1
/* Stubs for portability */ /* Stubs for portability */
#define GL_ALPHA_TEST 0 #define GL_ALPHA_TEST 0x0BC0
#define GL_STENCIL_TEST 0 #define GL_STENCIL_TEST 0x0B90
#define GL_UNPACK_ALIGNMENT 0 #define GL_UNPACK_ALIGNMENT 0x0CF5
#define GLAPI extern #define GLAPI extern
#define APIENTRY #define APIENTRY

4
samples/multitexture_arrays/main.c
View File

@ -46,13 +46,13 @@ void RenderCallback(GLuint texID0, GLuint texID1) {
glActiveTextureARB(GL_TEXTURE0_ARB); glActiveTextureARB(GL_TEXTURE0_ARB);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, texID0); 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 */ /* Bind multi-texture to GL_TEXTURE1_ARB and set texture parameters */
glActiveTextureARB(GL_TEXTURE1_ARB); glActiveTextureARB(GL_TEXTURE1_ARB);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, texID1); 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); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
/* Set Blending Mode */ /* Set Blending Mode */