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

fix: forgot a free to match a malloc

Browse Source
This commit is contained in:
Hayden Kowalchuk 2019-09-22 19:50:40 -04:00
parent 60496cce50
commit f497a24fe9
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GL/draw.c
View File

@ -820,6 +820,8 @@ static void generate(SubmissionTarget* target, const GLenum mode, const GLsizei
genTriangleStrip(_glSubmissionTargetStart(target), count); genTriangleStrip(_glSubmissionTargetStart(target), count);
break; break;
default: default:
printf("mode: 0x%08x\n", mode);
fflush(stdout);
assert(0 && "Not Implemented"); assert(0 && "Not Implemented");
} }

12
GL/state.c
View File

@ -206,11 +206,13 @@ void _glUpdatePVRTextureContext(pvr_poly_cxt_t* context, GLshort textureUnit) {
/* If we don't have complete mipmaps, and yet mipmapping was enabled, we disable texturing. /* If we don't have complete mipmaps, and yet mipmapping was enabled, we disable texturing.
* This is effectively what standard GL does (it renders a white texture) * This is effectively what standard GL does (it renders a white texture)
*/ */
if(!_glIsMipmapComplete(tx1) && enableMipmaps) { if(!_glIsMipmapComplete(tx1)) {
context->txr.enable = PVR_TEXTURE_DISABLE; filter = PVR_FILTER_BILINEAR;
context->txr.base = 0; enableMipmaps = GL_FALSE;
context->txr.format = 0; //context->txr.enable = PVR_TEXTURE_DISABLE;
return; //context->txr.base = 0;
//context->txr.format = 0;
//return;
} }
} else { } else {
if(tx1->minFilter == GL_LINEAR && tx1->magFilter == GL_LINEAR) { if(tx1->minFilter == GL_LINEAR && tx1->magFilter == GL_LINEAR) {

1
GL/texture.c
View File

@ -923,6 +923,7 @@ void _glAllocateSpaceForMipmaps(TextureObject* active) {
/* If there was existing data, then copy it where it should go */ /* If there was existing data, then copy it where it should go */
memcpy(_glGetMipmapLocation(active,0), temp, size); memcpy(_glGetMipmapLocation(active,0), temp, size);
free(temp);
} }
void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat, void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,

2
Makefile
View File

@ -14,7 +14,7 @@ OBJS += containers/stack.o containers/named_array.o containers/aligned_vector.o
SUBDIRS = SUBDIRS =
EXTRA_CFLAGS= -Wall -Wextra -Wstrict-aliasing=0 EXTRA_CFLAGS= -Wall -Wextra -Wstrict-aliasing=0
KOS_CFLAGS += -ffast-math -O2 -funroll-loops -fsingle-precision-constant -Iinclude -funsafe-math-optimizations -DBUILD_LIBGL KOS_CFLAGS += -ffast-math -O2 -funroll-loops -fsingle-precision-constant -Iinclude -funsafe-math-optimizations -DBUILD_LIBGL $(EXTRA_CFLAGS)
#KOS_CFLAGS += -O1 -mlra -Iinclude -DBUILD_LIBGL -Wall -Wextra #KOS_CFLAGS += -O1 -mlra -Iinclude -DBUILD_LIBGL -Wall -Wextra
#GCC5_FLAGS = -mfsca -mfsrra -mlra #GCC5_FLAGS = -mfsca -mfsrra -mlra