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

glCompressedTexImage2D is an ARB extension in OpenGL 1.2.1

Browse Source
This commit is contained in:
Luke Benstead 2018-08-07 20:49:10 +01:00
parent c40d3a007d
commit 86dd5dd2b2
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GL/texture.c
View File

@ -168,7 +168,7 @@ void APIENTRY glTexEnvf(GLenum target, GLenum pname, GLfloat param) {
glTexEnvi(target, pname, param); glTexEnvi(target, pname, param);
} }
void APIENTRY glCompressedTexImage2D(GLenum target, void APIENTRY glCompressedTexImage2DARB(GLenum target,
GLint level, GLint level,
GLenum internalFormat, GLenum internalFormat,
GLsizei width, GLsizei width,
@ -179,10 +179,10 @@ void APIENTRY glCompressedTexImage2D(GLenum target,
TRACE(); TRACE();
if(target != GL_TEXTURE_2D) if(target != GL_TEXTURE_2D)
_glKosThrowError(GL_INVALID_ENUM, "glCompressedTexImage2D"); _glKosThrowError(GL_INVALID_ENUM, __func__);
if(level < 0 || border) if(level < 0 || border)
_glKosThrowError(GL_INVALID_VALUE, "glCompressedTexImage2D"); _glKosThrowError(GL_INVALID_VALUE, __func__);
switch(internalFormat) { switch(internalFormat) {
case GL_COMPRESSED_ARGB_1555_VQ_KOS: case GL_COMPRESSED_ARGB_1555_VQ_KOS:
@ -193,11 +193,11 @@ void APIENTRY glCompressedTexImage2D(GLenum target,
case GL_COMPRESSED_RGB_565_VQ_TWID_KOS: case GL_COMPRESSED_RGB_565_VQ_TWID_KOS:
break; break;
default: default:
_glKosThrowError(GL_INVALID_OPERATION, "glCompressedTexImage2D"); _glKosThrowError(GL_INVALID_OPERATION, __func__);
} }
if(TEXTURE_UNITS[ACTIVE_TEXTURE] == NULL) { if(TEXTURE_UNITS[ACTIVE_TEXTURE] == NULL) {
_glKosThrowError(GL_INVALID_OPERATION, "glCompressedTexImage2D"); _glKosThrowError(GL_INVALID_OPERATION, __func__);
} }
if(_glKosHasError()) { if(_glKosHasError()) {

17
include/gl.h
View File

@ -510,23 +510,6 @@ GLAPI void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalForma
GLsizei width, GLsizei height, GLint border, GLsizei width, GLsizei height, GLint border,
GLenum format, GLenum type, const GLvoid *data); GLenum format, GLenum type, const GLvoid *data);
/* Loads VQ compressed texture from SH4 RAM into PVR VRAM */
/* internalformat must be one of the following constants:
GL_UNSIGNED_SHORT_5_6_5_VQ
GL_UNSIGNED_SHORT_5_6_5_VQ_TWID
GL_UNSIGNED_SHORT_4_4_4_4_VQ
GL_UNSIGNED_SHORT_4_4_4_4_VQ_TWID
GL_UNSIGNED_SHORT_1_5_5_5_VQ
GL_UNSIGNED_SHORT_1_5_5_5_VQ_TWID
*/
GLAPI void APIENTRY glCompressedTexImage2D(GLenum target,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLint border,
GLsizei imageSize,
const GLvoid *data);
/* GL Array API - Only GL_TRIANGLES, GL_TRIANGLE_STRIP, and GL_QUADS are supported */ /* GL Array API - Only GL_TRIANGLES, GL_TRIANGLE_STRIP, and GL_QUADS are supported */
GLAPI void APIENTRY glVertexPointer(GLint size, GLenum type, GLAPI void APIENTRY glVertexPointer(GLint size, GLenum type,

18
include/glext.h
View File

@ -126,6 +126,24 @@ GLAPI void APIENTRY glGenerateMipmapEXT(GLenum target);
GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT(GLenum target); GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT(GLenum target);
GLAPI GLboolean APIENTRY glIsFramebufferEXT(GLuint framebuffer); GLAPI GLboolean APIENTRY glIsFramebufferEXT(GLuint framebuffer);
/* Loads VQ compressed texture from SH4 RAM into PVR VRAM */
/* internalformat must be one of the following constants:
GL_UNSIGNED_SHORT_5_6_5_VQ
GL_UNSIGNED_SHORT_5_6_5_VQ_TWID
GL_UNSIGNED_SHORT_4_4_4_4_VQ
GL_UNSIGNED_SHORT_4_4_4_4_VQ_TWID
GL_UNSIGNED_SHORT_1_5_5_5_VQ
GL_UNSIGNED_SHORT_1_5_5_5_VQ_TWID
*/
GLAPI void APIENTRY glCompressedTexImage2DARB(GLenum target,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLint border,
GLsizei imageSize,
const GLvoid *data);
__END_DECLS __END_DECLS
#endif /* !__GL_GLEXT_H */ #endif /* !__GL_GLEXT_H */

2
samples/nehe06_vq/main.c
View File

@ -125,7 +125,7 @@ void LoadGLTextures() {
// 2d texture, level of detail 0 (normal), 3 components (red, green, blue), x size from image, y size from image, // 2d texture, level of detail 0 (normal), 3 components (red, green, blue), x size from image, y size from image,
// border 0 (normal), rgb color data, unsigned byte data, and finally the data itself. // border 0 (normal), rgb color data, unsigned byte data, and finally the data itself.
glCompressedTexImage2D( glCompressedTexImage2DARB(
GL_TEXTURE_2D, 0, image1->internalFormat, image1->sizeX, image1->sizeY, 0, GL_TEXTURE_2D, 0, image1->internalFormat, image1->sizeX, image1->sizeY, 0,
image1->dataSize, image1->data image1->dataSize, image1->data
); );