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

remove junk

Browse Source
This commit is contained in:
Hayden K 2019-03-13 07:11:32 -04:00
parent 84edc083ea
commit 20ac4e5480
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
GL/texture.c
View File

@ -775,6 +775,12 @@ 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) {
@ -933,40 +939,20 @@ 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;
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 */ /* 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; uint32 x, y, min, mask;
min = MIN(w, h); min = MIN(w, h);
mask = min - 1; mask = min - 1;
uint8 * pixels; uint16 * vtex (uint16*)targetData;
uint16 * vtex;
pixels = (uint8 *) data;
vtex = (uint16*)targetData;
for(y = 0; y < h; y += 2) { for(y = 0; y < h; y += 2) {
for(x = 0; x < w; x++) { for(x = 0; x < w; x++) {
vtex[TWIDOUT((y & mask) / 2, x & mask) + vtex[TWIDOUT((y & mask) / 2, x & mask) + (x / min + y / min)*min * min / 2] =
(x / min + y / min)*min * min / 2] = data[y * w + x] | (data[(y + 1) * w + x] << 8);
pixels[y * w + x] | (pixels[(y + 1) * w + x] << 8);
} }
} }
} else { } else {

2
containers/aligned_vector.c
View File

@ -31,8 +31,6 @@ void aligned_vector_reserve(AlignedVector* vector, unsigned int element_count) {
return; return;
} }
element_count = ((element_count+_VECTOR_ALIGN_COUNT) & ~_VECTOR_ALIGN_COUNT); element_count = ((element_count+_VECTOR_ALIGN_COUNT) & ~_VECTOR_ALIGN_COUNT);
//printf("List growing from %d -> %d\n",vector->size,element_count);
unsigned int original_byte_size = vector->size * vector->element_size; unsigned int original_byte_size = vector->size * vector->element_size;
unsigned int new_byte_size = element_count * vector->element_size; unsigned int new_byte_size = element_count * vector->element_size;