eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

minor compile fixes.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5669 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-04-19 03:44:32 +00:00
parent e8aa715763
commit 81617eaebc
4 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
engine/client/m_download.c
View file

@ -251,12 +251,17 @@ static void PM_FreePackage(package_t *p)
} }
} }
#ifdef WEBCLIENT
if (p->download) if (p->download)
{ //if its currently downloading, cancel it. { //if its currently downloading, cancel it.
DL_Close(p->download); DL_Close(p->download);
p->download = NULL; p->download = NULL;
} }
for (i = 0; i < countof(p->mirror); i++)
Z_Free(p->mirror[i]);
#endif
//free its data. //free its data.
while(p->deps) while(p->deps)
{ {
@ -265,9 +270,6 @@ static void PM_FreePackage(package_t *p)
Z_Free(d); Z_Free(d);
} }
for (i = 0; i < countof(p->mirror); i++)
Z_Free(p->mirror[i]);
Z_Free(p->name); Z_Free(p->name);
Z_Free(p->category); Z_Free(p->category);
Z_Free(p->title); Z_Free(p->title);

11
engine/gl/gl_vidcommon.c
View file

@ -221,12 +221,11 @@ void (APIENTRY *qglDeleteBuffersARB)(GLsizei n, GLuint* ids);
void (APIENTRY *qglBindBufferARB)(GLenum target, GLuint id); void (APIENTRY *qglBindBufferARB)(GLenum target, GLuint id);
void (APIENTRY *qglBufferDataARB)(GLenum target, GLsizei size, const void* data, GLenum usage); void (APIENTRY *qglBufferDataARB)(GLenum target, GLsizei size, const void* data, GLenum usage);
void (APIENTRY *qglBufferSubDataARB)(GLenum target, GLint offset, GLsizei size, void* data); void (APIENTRY *qglBufferSubDataARB)(GLenum target, GLint offset, GLsizei size, void* data);
void *(APIENTRY *qglMapBufferARB)(GLenum target, GLenum access);
GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
void *(APIENTRY *qglMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
#endif #endif
void *(APIENTRY *qglMapBufferARB)(GLenum target, GLenum access);
GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
void *(APIENTRY *qglMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
void (APIENTRY *qglBufferStorage)(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags); void (APIENTRY *qglBufferStorage)(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags);
void (APIENTRY *qglTexStorage2D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); //gl4.2 void (APIENTRY *qglTexStorage2D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); //gl4.2
@ -965,12 +964,12 @@ static qboolean GL_CheckExtensions (void *(*getglfunction) (char *name))
qglMapBufferARB = NULL; qglMapBufferARB = NULL;
qglUnmapBufferARB = NULL; qglUnmapBufferARB = NULL;
} }
#endif
//ARB_map_buffer_range: core in gl3.0/gles3.0, the extension is backported, and thus no ARB postfix on functions. //ARB_map_buffer_range: core in gl3.0/gles3.0, the extension is backported, and thus no ARB postfix on functions.
qglMapBufferRange = (void *)getglext("glMapBufferRange"); qglMapBufferRange = qglUnmapBufferARB?(void *)getglext("glMapBufferRange"):NULL;
if (qglBufferSubDataARB && qglMapBufferRange) if (qglBufferSubDataARB && qglMapBufferRange)
#endif
{ {
if ((!gl_config.gles && gl_config.glversion >= 4.4) || GL_CheckExtension("GL_ARB_buffer_storage")) if ((!gl_config.gles && gl_config.glversion >= 4.4) || GL_CheckExtension("GL_ARB_buffer_storage"))
if (gl_immutable_buffers.ival) if (gl_immutable_buffers.ival)

13
engine/gl/glquake.h
View file

@ -624,8 +624,6 @@ void R_NetGraph (void);
#define qglBindBufferARB glBindBuffer #define qglBindBufferARB glBindBuffer
#define qglBufferDataARB glBufferData #define qglBufferDataARB glBufferData
#define qglBufferSubDataARB glBufferSubData #define qglBufferSubDataARB glBufferSubData
#define qglMapBufferARB glMapBuffer
#define qglUnmapBufferARB glUnmapBuffer
#else #else
extern void (APIENTRY *qglBindTexture) (GLenum target, GLuint texture); extern void (APIENTRY *qglBindTexture) (GLenum target, GLuint texture);
@ -727,8 +725,7 @@ extern void (APIENTRY *qglDeleteBuffersARB)(GLsizei n, GLuint* ids);
extern void (APIENTRY *qglBindBufferARB)(GLenum target, GLuint id); extern void (APIENTRY *qglBindBufferARB)(GLenum target, GLuint id);
extern void (APIENTRY *qglBufferDataARB)(GLenum target, GLsizei size, const void* data, GLenum usage); extern void (APIENTRY *qglBufferDataARB)(GLenum target, GLsizei size, const void* data, GLenum usage);
extern void (APIENTRY *qglBufferSubDataARB)(GLenum target, GLint offset, GLsizei size, void* data); extern void (APIENTRY *qglBufferSubDataARB)(GLenum target, GLint offset, GLsizei size, void* data);
extern void *(APIENTRY *qglMapBufferARB)(GLenum target, GLenum access); #endif
extern GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
#define GLintptr qintptr_t #define GLintptr qintptr_t
#define GLsizeiptr quintptr_t #define GLsizeiptr quintptr_t
@ -744,10 +741,10 @@ extern GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
#ifndef GL_MAP_COHERENT_BIT #ifndef GL_MAP_COHERENT_BIT
#define GL_MAP_COHERENT_BIT 0x0080 #define GL_MAP_COHERENT_BIT 0x0080
#endif #endif
extern void *(APIENTRY *qglMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); extern void *(APIENTRY *qglMapBufferARB)(GLenum target, GLenum access);
extern GLboolean (APIENTRY *qglUnmapBufferARB)(GLenum target);
#endif extern void *(APIENTRY *qglMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); //gl3.0
extern void (APIENTRY *qglBufferStorage)(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags); extern void (APIENTRY *qglBufferStorage)(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags); //gl4.4
extern void (APIENTRY *qglGenQueriesARB)(GLsizei n, GLuint *ids); extern void (APIENTRY *qglGenQueriesARB)(GLsizei n, GLuint *ids);
extern void (APIENTRY *qglDeleteQueriesARB)(GLsizei n, const GLuint *ids); extern void (APIENTRY *qglDeleteQueriesARB)(GLsizei n, const GLuint *ids);

2
engine/server/server.h
View file

@ -1261,7 +1261,7 @@ void MSV_OpenUserDatabase(void);
#define MSV_ClusterLogin(info) false #define MSV_ClusterLogin(info) false
#define SSV_IsSubServer() false #define SSV_IsSubServer() false
#define MSV_OpenUserDatabase() #define MSV_OpenUserDatabase()
#define MSV_PollSlaves() false #define MSV_PollSlaves()
#define MSV_ForwardToAutoServer() false #define MSV_ForwardToAutoServer() false
#endif #endif