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

Change to single file

Browse Source
This commit is contained in:
Hayden K 2019-04-15 14:11:17 -04:00
parent 1c160ff519
commit a812fd572e
5 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GL/draw.c
View File

@ -7,6 +7,7 @@
#include "../include/gl.h" #include "../include/gl.h"
#include "../include/glext.h" #include "../include/glext.h"
#include "../include/glkos.h"
#include "private.h" #include "private.h"
#include "profiler.h" #include "profiler.h"
@ -1055,11 +1056,13 @@ static void submitVertices(GLenum mode, GLsizei first, GLuint count, GLenum type
GLint activeTexture; GLint activeTexture;
glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &activeTexture); glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &activeTexture);
glActiveTextureARB(GL_TEXTURE0); doTexture =_GetBooleanTextureEnabled(GL_TEXTURE0);
glGetBooleanv(GL_TEXTURE_2D, &doTexture); //glActiveTextureARB(GL_TEXTURE0);
//glGetBooleanv(GL_TEXTURE_2D, &doTexture);
glActiveTextureARB(GL_TEXTURE1); doMultitexture = _GetBooleanTextureEnabled(GL_TEXTURE1);
glGetBooleanv(GL_TEXTURE_2D, &doMultitexture); //glActiveTextureARB(GL_TEXTURE1);
//glGetBooleanv(GL_TEXTURE_2D, &doMultitexture);
doLighting = _glIsLightingEnabled(); doLighting = _glIsLightingEnabled();
@ -1108,7 +1111,7 @@ static void submitVertices(GLenum mode, GLsizei first, GLuint count, GLenum type
generate(target, mode, first, count, (GLubyte*) indices, type, doTexture, doMultitexture, doLighting); generate(target, mode, first, count, (GLubyte*) indices, type, doTexture, doMultitexture, doLighting);
profiler_checkpoint("generate"); profiler_checkpoint("generate");
light(target); light(target);
profiler_checkpoint("light"); profiler_checkpoint("light");

21
GL/gldc.c Normal file
View File

@ -0,0 +1,21 @@
#include "../include/gl.h"
#include "../include/glu.h"
#include "../include/glext.h"
#include "../include/glkos.h"
#include "private.h"
#include "config.h"
#include "profiler.h"
#include "../containers/aligned_vector.h"
#include "clip.c"
#include "draw.c"
#include "error.c"
#include "flush.c"
#include "fog.c"
#include "framebuffer.c"
#include "glu.c"
#include "immediate.c"
#include "lighting.c"
#include "matrix.c"
#include "state.c"
#include "texture.c"

2
GL/texture.c
View File

@ -17,7 +17,7 @@
static TextureObject* TEXTURE_UNITS[MAX_TEXTURE_UNITS] = {NULL, NULL}; static TextureObject* TEXTURE_UNITS[MAX_TEXTURE_UNITS] = {NULL, NULL};
static NamedArray TEXTURE_OBJECTS; static NamedArray TEXTURE_OBJECTS;
static GLubyte ACTIVE_TEXTURE = 0; GLubyte ACTIVE_TEXTURE = 0;
static TexturePalette* SHARED_PALETTES[4] = {NULL, NULL, NULL, NULL}; static TexturePalette* SHARED_PALETTES[4] = {NULL, NULL, NULL, NULL};

8
Makefile
View File

@ -6,12 +6,14 @@
# Copyright (C) 2018 Luke Benstead # Copyright (C) 2018 Luke Benstead
TARGET = libGLdc.a TARGET = libGLdc.a
OBJS = GL/draw.o GL/flush.o GL/framebuffer.o GL/immediate.o GL/lighting.o GL/state.o GL/texture.o GL/glu.o OBJS = GL/gldc.o
OBJS += GL/matrix.o GL/fog.o GL/error.o GL/clip.o containers/stack.o containers/named_array.o containers/aligned_vector.o GL/profiler.o #OBJS = GL/draw.o GL/flush.o GL/framebuffer.o GL/immediate.o GL/lighting.o GL/state.o GL/texture.o GL/glu.o
#OBJS += GL/matrix.o GL/fog.o GL/error.o GL/clip.o containers/stack.o containers/named_array.o containers/aligned_vector.o GL/profiler.o
OBJS += containers/stack.o containers/named_array.o containers/aligned_vector.o GL/profiler.o
SUBDIRS = SUBDIRS =
KOS_CFLAGS += -ffast-math -Ofast -Iinclude KOS_CFLAGS += -ffast-math -O3 -funroll-loops -Iinclude
link: link:
$(KOS_AR) rcs $(TARGET) $(OBJS) $(KOS_AR) rcs $(TARGET) $(OBJS)

4
include/glkos.h
View File

@ -97,4 +97,6 @@ GLAPI void APIENTRY glKOS_INTERNAL_SetMipmapBias(GLubyte level);
#define GL_SHARED_TEXTURE_BANK_KOS 0xEF00 #define GL_SHARED_TEXTURE_BANK_KOS 0xEF00
__END_DECLS __END_DECLS
extern GLboolean TEXTURES_ENABLED[];
extern GLubyte ACTIVE_TEXTURE;
#define _GetBooleanTextureEnabled(TEXTURE_INDEX) ( TEXTURE_INDEX == GL_TEXTURE0 ? TEXTURES_ENABLED[0] : TEXTURES_ENABLED[1] )