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

Fix crash when generating mipmaps on 4bpp textures

Browse Source
This commit is contained in:
Luke Benstead 2022-05-07 12:57:45 +01:00
parent 3d1f447af9
commit fe7f9cbed0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GL/framebuffer.c
View File

@ -274,6 +274,12 @@ void APIENTRY glGenerateMipmapEXT(GLenum target) {
return; return;
} }
if((tex->color & GPU_TXRFMT_PAL4BPP) == GPU_TXRFMT_PAL4BPP) {
fprintf(stderr, "[GL ERROR] Mipmap generation not supported for 4BPP paletted textures\n");
_glKosThrowError(GL_INVALID_OPERATION, __func__);
return;
}
if((tex->color & GPU_TXRFMT_NONTWIDDLED) == GPU_TXRFMT_NONTWIDDLED) { if((tex->color & GPU_TXRFMT_NONTWIDDLED) == GPU_TXRFMT_NONTWIDDLED) {
/* glTexImage2D should twiddle internally textures in nearly all cases /* glTexImage2D should twiddle internally textures in nearly all cases
* so this error is unlikely */ * so this error is unlikely */
@ -321,10 +327,10 @@ void APIENTRY glGenerateMipmapEXT(GLenum target) {
} }
/* generate mipmaps for any image provided by the user and then pass them to OpenGL */ /* generate mipmaps for any image provided by the user and then pass them to OpenGL */
GLAPI GLint APIENTRY gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLAPI GLvoid APIENTRY gluBuild2DMipmaps(GLenum target, GLint internalFormat,
GLsizei width, GLsizei height, GLsizei width, GLsizei height,
GLenum format, GLenum type, const void *data){ GLenum format, GLenum type, const void *data){
/* 2d texture, level of detail 0 (normal), 3 components (red, green, blue), /* 2d texture, level of detail 0 (normal), 3 components (red, green, blue),
width & height of the image, border 0 (normal), rgb color data, width & height of the image, border 0 (normal), rgb color data,
unsigned byte data, and finally the data itself. */ unsigned byte data, and finally the data itself. */
glTexImage2D(GL_TEXTURE_2D, 0, 3, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, data); glTexImage2D(GL_TEXTURE_2D, 0, 3, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);

1
GL/texture.c
View File

@ -775,6 +775,7 @@ void APIENTRY glCompressedTexImage2DARB(GLenum target,
return; return;
default: { default: {
fprintf(stderr, "Unsupported internalFormat: %d\n", internalFormat);
_glKosThrowError(GL_INVALID_OPERATION, __func__); _glKosThrowError(GL_INVALID_OPERATION, __func__);
return; return;
} }