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

ok thanks

Browse Source
This commit is contained in:
Hayden Kowalchuk 2019-02-27 22:50:56 -05:00
parent 920fc2b782
commit 50b9e55014
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GL/draw.c
View File

@ -1320,7 +1320,8 @@ GLuint _glGetActiveClientTexture() {
} }
void APIENTRY glClientActiveTextureARB(GLenum texture) { void APIENTRY glClientActiveTextureARB(GLenum texture) {
TRACE(); //@TODO: Uncomment
//TRACE();
if(texture < GL_TEXTURE0_ARB || texture > GL_TEXTURE0_ARB + MAX_TEXTURE_UNITS) { if(texture < GL_TEXTURE0_ARB || texture > GL_TEXTURE0_ARB + MAX_TEXTURE_UNITS) {
_glKosThrowError(GL_INVALID_ENUM, "glClientActiveTextureARB"); _glKosThrowError(GL_INVALID_ENUM, "glClientActiveTextureARB");

2
GL/private.h
View File

@ -6,7 +6,7 @@
#include "../containers/named_array.h" #include "../containers/named_array.h"
#include "./clip.h" #include "./clip.h"
#define TRACE_ENABLED 0 #define TRACE_ENABLED 1
#define TRACE() if(TRACE_ENABLED) {fprintf(stderr, "%s\n", __func__);} #define TRACE() if(TRACE_ENABLED) {fprintf(stderr, "%s\n", __func__);}
#define VERTEX_ENABLED_FLAG (1 << 0) #define VERTEX_ENABLED_FLAG (1 << 0)

2
GL/state.c
View File

@ -103,7 +103,7 @@ static int _calcPVRBlendFactor(GLenum factor) {
case GL_ONE: case GL_ONE:
return PVR_BLEND_ONE; return PVR_BLEND_ONE;
default: default:
fprintf(stderr, "Invalid blend mode: %d\n", factor); printf("Invalid blend mode: %d\n", factor);
return PVR_BLEND_ONE; return PVR_BLEND_ONE;
} }
} }

34
GL/texture.c
View File

@ -153,7 +153,8 @@ TextureObject* getBoundTexture() {
} }
void APIENTRY glActiveTextureARB(GLenum texture) { void APIENTRY glActiveTextureARB(GLenum texture) {
TRACE(); //@TODO: Uncomment
//TRACE();
if(texture < GL_TEXTURE0_ARB || texture > GL_TEXTURE0_ARB + MAX_TEXTURE_UNITS) if(texture < GL_TEXTURE0_ARB || texture > GL_TEXTURE0_ARB + MAX_TEXTURE_UNITS)
_glKosThrowError(GL_INVALID_ENUM, "glActiveTextureARB"); _glKosThrowError(GL_INVALID_ENUM, "glActiveTextureARB");
@ -575,6 +576,7 @@ static inline void _i8_to_i8(const GLubyte* source, GLubyte* dest) {
} }
static TextureConversionFunc _determineConversion(GLint internalFormat, GLenum format, GLenum type) { static TextureConversionFunc _determineConversion(GLint internalFormat, GLenum format, GLenum type) {
printf("attempted conversion: %x -> %x, %x \n", internalFormat, format, type);
switch(internalFormat) { switch(internalFormat) {
case GL_ALPHA: { case GL_ALPHA: {
if(type == GL_UNSIGNED_BYTE && format == GL_RGBA) { if(type == GL_UNSIGNED_BYTE && format == GL_RGBA) {
@ -632,7 +634,7 @@ static TextureConversionFunc _determineConversion(GLint internalFormat, GLenum f
} }
break; break;
default: default:
fprintf(stderr, "Unsupported conversion: %x -> %x, %x\n", internalFormat, format, type); printf("Unsupported conversion: %x -> %x, %x\n", internalFormat, format, type);
break; break;
} }
return 0; return 0;
@ -671,14 +673,15 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
GLenum format, GLenum type, const GLvoid *data) { GLenum format, GLenum type, const GLvoid *data) {
TRACE(); TRACE();
printf("glTexImage2D(%x, %d, %x, %d, %d, %d ,%x, %x, *data) \n", target, level, internalFormat,width, height, border, format, type);
if(target != GL_TEXTURE_2D) { if(target != GL_TEXTURE_2D) {
_glKosThrowError(GL_INVALID_ENUM, "glTexImage2D"); _glKosThrowError(GL_INVALID_ENUM, "glTexImage2D-tex2d");
} }
if(format != GL_COLOR_INDEX) { if(format != GL_COLOR_INDEX) {
if(!_isSupportedFormat(format)) { if(!_isSupportedFormat(format)) {
_glKosThrowError(GL_INVALID_ENUM, "glTexImage2D"); _glKosThrowError(GL_INVALID_ENUM, "glTexImage2D-color_index");
} }
/* Abuse determineStride to see if type is valid */ /* Abuse determineStride to see if type is valid */
@ -688,43 +691,43 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
internalFormat = _cleanInternalFormat(internalFormat); internalFormat = _cleanInternalFormat(internalFormat);
if(internalFormat == -1) { if(internalFormat == -1) {
_glKosThrowError(GL_INVALID_VALUE, "glTexImage2D"); _glKosThrowError(GL_INVALID_VALUE, "glTexImage2D-internal_fmt");
} }
} else { } else {
if(internalFormat != GL_COLOR_INDEX8_EXT) { if(internalFormat != GL_COLOR_INDEX8_EXT) {
_glKosThrowError(GL_INVALID_ENUM, __func__); _glKosThrowError(GL_INVALID_ENUM, "glTexImage2D-8EXT");
} }
} }
GLint w = width; GLint w = width;
if(w < 8 || (w & -w) != w) { if(w < 8 || (w & -w) != w) {
/* Width is not a power of two. Must be!*/ /* Width is not a power of two. Must be!*/
_glKosThrowError(GL_INVALID_VALUE, "glTexImage2D"); _glKosThrowError(GL_INVALID_VALUE, "glTexImage2D-width");
} }
GLint h = height; GLint h = height;
if(h < 8 || (h & -h) != h) { if(h < 8 || (h & -h) != h) {
/* height is not a power of two. Must be!*/ /* height is not a power of two. Must be!*/
_glKosThrowError(GL_INVALID_VALUE, "glTexImage2D"); _glKosThrowError(GL_INVALID_VALUE, "glTexImage2D-height");
} }
if(level < 0) { if(level < 0) {
_glKosThrowError(GL_INVALID_VALUE, "glTexImage2D"); _glKosThrowError(GL_INVALID_VALUE, "glTexImage2D-level");
} }
if(border) { if(border) {
_glKosThrowError(GL_INVALID_VALUE, "glTexImage2D"); _glKosThrowError(GL_INVALID_VALUE, "glTexImage2D-border");
} }
if(!TEXTURE_UNITS[ACTIVE_TEXTURE]) { if(!TEXTURE_UNITS[ACTIVE_TEXTURE]) {
_glKosThrowError(GL_INVALID_OPERATION, "glTexImage2D"); _glKosThrowError(GL_INVALID_OPERATION, "glTexImage2D-active_tex");
} }
GLboolean isPaletted = (internalFormat == GL_COLOR_INDEX8_EXT) ? GL_TRUE : GL_FALSE; GLboolean isPaletted = (internalFormat == GL_COLOR_INDEX8_EXT) ? GL_TRUE : GL_FALSE;
if(isPaletted && level > 0) { if(isPaletted && level > 0) {
/* Paletted textures can't have mipmaps */ /* Paletted textures can't have mipmaps */
_glKosThrowError(GL_INVALID_OPERATION, __func__); _glKosThrowError(GL_INVALID_OPERATION, "glTexImage2D-palette_level");
} }
if(_glKosHasError()) { if(_glKosHasError()) {
@ -826,7 +829,7 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
); );
if(!convert) { if(!convert) {
_glKosThrowError(GL_INVALID_OPERATION, __func__); _glKosThrowError(GL_INVALID_OPERATION, "glTexImage2D-convert");
return; return;
} }
@ -836,7 +839,7 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
GLint stride = _determineStride(format, type); GLint stride = _determineStride(format, type);
if(stride == -1) { if(stride == -1) {
_glKosThrowError(GL_INVALID_OPERATION, __func__); _glKosThrowError(GL_INVALID_OPERATION, "glTexImage2D-stride");
return; return;
} }
@ -850,6 +853,9 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
} }
} }
} }
void APIENTRY glTexParameterf(GLenum target, GLenum pname, GLint param) {
glTexParameteri(target, pname, (GLint)param);
}
void APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param) { void APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param) {
TRACE(); TRACE();