zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

jwzgles: Revert part of r5655 that wiped out my cast-qual fixes from r5551.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5674 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-03-28 05:15:14 +00:00
parent 84c949c419
commit 82e9e4e304
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
polymer/eduke32/build/src/jwzgles.c
View file

@ -2955,7 +2955,7 @@ jwzgles_glTexImage2D (GLenum target,
GLenum type, GLenum type,
const GLvoid *data) const GLvoid *data)
{ {
GLvoid *d2 = (GLvoid *) data; GLvoid *d2 = NULL;
Assert (!state->compiling_verts, "glTexImage2D not allowed inside glBegin"); Assert (!state->compiling_verts, "glTexImage2D not allowed inside glBegin");
Assert (!state->compiling_list, /* technically legal, but stupid! */ Assert (!state->compiling_list, /* technically legal, but stupid! */
"glTexImage2D not allowed inside glNewList"); "glTexImage2D not allowed inside glNewList");
@ -2974,7 +2974,7 @@ jwzgles_glTexImage2D (GLenum target,
/* GLES does not let us omit the data pointer to create a blank texture. */ /* GLES does not let us omit the data pointer to create a blank texture. */
if (! data) if (! data)
{ {
d2 = (GLvoid *) calloc (1, width * height * sizeof(GLfloat) * 4); data = d2 = (GLvoid *) calloc (1, width * height * sizeof(GLfloat) * 4);
Assert (d2, "out of memory"); Assert (d2, "out of memory");
} }
@ -2987,12 +2987,12 @@ jwzgles_glTexImage2D (GLenum target,
LOG10 ("direct %-12s %s %d %s %d %d %d %s %s 0x%lX", "glTexImage2D", LOG10 ("direct %-12s %s %d %s %d %d %d %s %s 0x%lX", "glTexImage2D",
mode_desc(target), level, mode_desc(internalFormat), mode_desc(target), level, mode_desc(internalFormat),
width, height, border, mode_desc(format), mode_desc(type), width, height, border, mode_desc(format), mode_desc(type),
(unsigned long) d2); (unsigned long) data);
glTexImage2D (target, level, internalFormat, width, height, border, glTexImage2D (target, level, internalFormat, width, height, border,
format, type, d2); /* the real one */ format, type, data); /* the real one */
CHECK("glTexImage2D"); CHECK("glTexImage2D");
if (d2 != data) free (d2); free (d2);
} }
void void
@ -3258,7 +3258,7 @@ jwzgles_gluBuild2DMipmaps (GLenum target,
int w2 = to_pow2(width); int w2 = to_pow2(width);
int h2 = to_pow2(height); int h2 = to_pow2(height);
void *d2 = (void *) data; void *d2 = NULL;
/* OpenGLES no longer supports "4" as a synonym for "RGBA". */ /* OpenGLES no longer supports "4" as a synonym for "RGBA". */
switch (internalFormat) { switch (internalFormat) {
@ -3283,10 +3283,10 @@ jwzgles_gluBuild2DMipmaps (GLenum target,
int ibpl = istride * width; int ibpl = istride * width;
int obpl = ostride * w2; int obpl = ostride * w2;
int oy; int oy;
const unsigned char *in = (unsigned char *) data; const unsigned char *in = (const unsigned char *) data;
unsigned char *out = (unsigned char *) malloc(h2 * obpl); unsigned char *out = (unsigned char *) malloc(h2 * obpl);
Assert (out, "out of memory"); Assert (out, "out of memory");
d2 = out; data = d2 = out;
for (oy = 0; oy < h2; oy++) for (oy = 0; oy < h2; oy++)
{ {
@ -3312,8 +3312,8 @@ jwzgles_gluBuild2DMipmaps (GLenum target,
} }
jwzgles_glTexImage2D (target, 0, internalFormat, w2, h2, 0, jwzgles_glTexImage2D (target, 0, internalFormat, w2, h2, 0,
format, type, d2); format, type, data);
if (d2 != data) free (d2); free (d2);
return 0; return 0;
} }