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 K 2019-03-04 10:11:12 -05:00
commit d79b044b73
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GL/texture.c
View File

@ -36,6 +36,13 @@ void _glApplyColorTable() {
if(_glIsSharedTexturePaletteEnabled()) { if(_glIsSharedTexturePaletteEnabled()) {
src = SHARED_PALETTE; src = SHARED_PALETTE;
assert(src);
/* Don't apply a palette if we haven't uploaded one yet */
if(!src->data) {
return;
}
} else { } else {
TextureObject* active = _glGetBoundTexture(); TextureObject* active = _glGetBoundTexture();
@ -147,6 +154,9 @@ GLubyte _glInitTextures() {
named_array_reserve(&TEXTURE_OBJECTS, 0); named_array_reserve(&TEXTURE_OBJECTS, 0);
SHARED_PALETTE = (TexturePalette*) malloc(sizeof(TexturePalette)); SHARED_PALETTE = (TexturePalette*) malloc(sizeof(TexturePalette));
SHARED_PALETTE->data = NULL;
SHARED_PALETTE->format = 0;
SHARED_PALETTE->width = 0;
return 1; return 1;
} }