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

final finishing touches. DEPRECRATE Reserve*List funcs

Browse Source
This commit is contained in:
Hayden K 2019-03-13 07:01:58 -04:00
parent edbff32340
commit b301f51bd9
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GL/flush.c
View File

@ -164,15 +164,15 @@ void APIENTRY glKosSwapBuffers() {
void APIENTRY glKosReserveOPList(unsigned int elements){ void APIENTRY glKosReserveOPList(unsigned int elements){
aligned_vector_reserve(&OP_LIST.vector, elements); aligned_vector_reserve(&OP_LIST.vector, elements);
aligned_vector_reserve(_glKosINTERNALGetVertices(), elements/3); aligned_vector_reserve((AlignedVector*)_glKosINTERNALGetVertices(), elements/3);
} }
void APIENTRY glKosReservePTList(unsigned int elements){ void APIENTRY glKosReservePTList(unsigned int elements){
aligned_vector_reserve(&PT_LIST.vector, elements); aligned_vector_reserve(&PT_LIST.vector, elements);
aligned_vector_reserve(_glKosINTERNALGetVertices(), elements/3); aligned_vector_reserve((AlignedVector*)_glKosINTERNALGetVertices(), elements/3);
} }
void APIENTRY glKosReserveTRList(unsigned int elements){ void APIENTRY glKosReserveTRList(unsigned int elements){
aligned_vector_reserve(&TR_LIST.vector, elements); aligned_vector_reserve(&TR_LIST.vector, elements);
aligned_vector_reserve(_glKosINTERNALGetVertices(), elements/3); aligned_vector_reserve((AlignedVector*)_glKosINTERNALGetVertices(), elements/3);
} }

2
GL/state.c
View File

@ -131,7 +131,7 @@ static void _updatePVRBlend(pvr_poly_cxt_t* context) {
} }
} }
GLboolean _glCheckValidEnum(GLint param, GLenum* values, const char* func) { GLboolean _glCheckValidEnum(GLenum param, GLenum* values, const char* func) {
GLubyte found = 0; GLubyte found = 0;
while(*values != 0) { while(*values != 0) {
if(*values == (GLenum)param) { if(*values == (GLenum)param) {

43
GL/texture.c
View File

@ -225,6 +225,8 @@ GLubyte _glInitTextures() {
SHARED_PALETTES[2] = _initTexturePalette(); SHARED_PALETTES[2] = _initTexturePalette();
SHARED_PALETTES[3] = _initTexturePalette(); SHARED_PALETTES[3] = _initTexturePalette();
memset((void*)BANKS_USED,0x0,sizeof(BANKS_USED));
return 1; return 1;
} }
@ -773,13 +775,6 @@ GLboolean _glIsMipmapComplete(const TextureObject* obj) {
return GL_TRUE; return GL_TRUE;
} }
#define TWIDTAB(x) ( (x&1)|((x&2)<<1)|((x&4)<<2)|((x&8)<<3)|((x&16)<<4)| \
((x&32)<<5)|((x&64)<<6)|((x&128)<<7)|((x&256)<<8)|((x&512)<<9) )
#define TWIDOUT(x, y) ( TWIDTAB((y)) | (TWIDTAB((x)) << 1) )
#define MIN(a, b) ( (a)<(b)? (a):(b) )
void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat, void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
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) {
@ -938,16 +933,40 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
assert(bytes); assert(bytes);
if(needsTwiddling) { if(needsTwiddling) {
assert(type == GL_UNSIGNED_BYTE); // Anything else needs this loop adjusting /*assert(type == GL_UNSIGNED_BYTE); // Anything else needs this loop adjusting
GLuint x, y, min, min2, mask; GLuint x, y;
for(y = 0; y < height; ++y) {
for(x = 0; x < width; ++x) {
GLuint src = (y * width) + x;
GLuint dest = morton_index(x, y);
targetData[dest] = ((GLubyte*) data)[src];
}
}
*/
/* Don't convert color indexes */
/* Linear/iterative twiddling algorithm from Marcus' tatest */
#define TWIDTAB(x) ( (x&1)|((x&2)<<1)|((x&4)<<2)|((x&8)<<3)|((x&16)<<4)| \
((x&32)<<5)|((x&64)<<6)|((x&128)<<7)|((x&256)<<8)|((x&512)<<9) )
#define TWIDOUT(x, y) ( TWIDTAB((y)) | (TWIDTAB((x)) << 1) )
#define MIN(a, b) ( (a)<(b)? (a):(b) )
uint32 x, y, min, mask;
min = MIN(w, h); min = MIN(w, h);
min2 = min * min;
mask = min - 1; mask = min - 1;
uint8 * pixels;
uint16 * vtex;
pixels = (uint8 *) data;
vtex = (uint16*)targetData;
for(y = 0; y < h; y++) { for(y = 0; y < h; y += 2) {
for(x = 0; x < w; x++) { for(x = 0; x < w; x++) {
targetData[TWIDOUT(x & mask, y & mask) + (x / min + y / min) * min2] = ((GLubyte*) data)[y * w + x]; vtex[TWIDOUT((y & mask) / 2, x & mask) +
(x / min + y / min)*min * min / 2] =
pixels[y * w + x] | (pixels[(y + 1) * w + x] << 8);
} }
} }
} else { } else {