Merge branch 'master' into opengl-is-a-bad-renderer
This commit is contained in:
commit
e91a689478
|
@ -220,11 +220,6 @@ FUNCPRINTF void DBG_Printf(const char *lpFmt, ...)
|
||||||
#define pglDrawElements glDrawElements
|
#define pglDrawElements glDrawElements
|
||||||
#define pglEnableClientState glEnableClientState
|
#define pglEnableClientState glEnableClientState
|
||||||
#define pglDisableClientState glDisableClientState
|
#define pglDisableClientState glDisableClientState
|
||||||
#define pglClientActiveTexture glClientActiveTexture
|
|
||||||
#define pglGenBuffers glGenBuffers
|
|
||||||
#define pglBindBuffer glBindBuffer
|
|
||||||
#define pglBufferData glBufferData
|
|
||||||
#define pglDeleteBuffers glDeleteBuffers
|
|
||||||
|
|
||||||
/* Lighting */
|
/* Lighting */
|
||||||
#define pglShadeModel glShadeModel
|
#define pglShadeModel glShadeModel
|
||||||
|
@ -330,15 +325,6 @@ typedef void (APIENTRY * PFNglEnableClientState) (GLenum cap);
|
||||||
static PFNglEnableClientState pglEnableClientState;
|
static PFNglEnableClientState pglEnableClientState;
|
||||||
typedef void (APIENTRY * PFNglDisableClientState) (GLenum cap);
|
typedef void (APIENTRY * PFNglDisableClientState) (GLenum cap);
|
||||||
static PFNglDisableClientState pglDisableClientState;
|
static PFNglDisableClientState pglDisableClientState;
|
||||||
typedef void (APIENTRY * PFNglGenBuffers) (GLsizei n, GLuint *buffers);
|
|
||||||
static PFNglGenBuffers pglGenBuffers;
|
|
||||||
typedef void (APIENTRY * PFNglBindBuffer) (GLenum target, GLuint buffer);
|
|
||||||
static PFNglBindBuffer pglBindBuffer;
|
|
||||||
typedef void (APIENTRY * PFNglBufferData) (GLenum target, GLsizei size, const GLvoid *data, GLenum usage);
|
|
||||||
static PFNglBufferData pglBufferData;
|
|
||||||
typedef void (APIENTRY * PFNglDeleteBuffers) (GLsizei n, const GLuint *buffers);
|
|
||||||
static PFNglDeleteBuffers pglDeleteBuffers;
|
|
||||||
|
|
||||||
|
|
||||||
/* Lighting */
|
/* Lighting */
|
||||||
typedef void (APIENTRY * PFNglShadeModel) (GLenum mode);
|
typedef void (APIENTRY * PFNglShadeModel) (GLenum mode);
|
||||||
|
@ -396,6 +382,17 @@ static PFNglMultiTexCoord2fv pglMultiTexCoord2fv;
|
||||||
typedef void (APIENTRY *PFNglClientActiveTexture) (GLenum);
|
typedef void (APIENTRY *PFNglClientActiveTexture) (GLenum);
|
||||||
static PFNglClientActiveTexture pglClientActiveTexture;
|
static PFNglClientActiveTexture pglClientActiveTexture;
|
||||||
|
|
||||||
|
/* 1.5 functions for buffers */
|
||||||
|
typedef void (APIENTRY * PFNglGenBuffers) (GLsizei n, GLuint *buffers);
|
||||||
|
static PFNglGenBuffers pglGenBuffers;
|
||||||
|
typedef void (APIENTRY * PFNglBindBuffer) (GLenum target, GLuint buffer);
|
||||||
|
static PFNglBindBuffer pglBindBuffer;
|
||||||
|
typedef void (APIENTRY * PFNglBufferData) (GLenum target, GLsizei size, const GLvoid *data, GLenum usage);
|
||||||
|
static PFNglBufferData pglBufferData;
|
||||||
|
typedef void (APIENTRY * PFNglDeleteBuffers) (GLsizei n, const GLuint *buffers);
|
||||||
|
static PFNglDeleteBuffers pglDeleteBuffers;
|
||||||
|
|
||||||
|
|
||||||
/* 1.2 Parms */
|
/* 1.2 Parms */
|
||||||
/* GL_CLAMP_TO_EDGE_EXT */
|
/* GL_CLAMP_TO_EDGE_EXT */
|
||||||
#ifndef GL_CLAMP_TO_EDGE
|
#ifndef GL_CLAMP_TO_EDGE
|
||||||
|
@ -511,6 +508,8 @@ boolean SetupGLFunc13(void)
|
||||||
pglMultiTexCoord2f = GetGLFunc("glMultiTexCoord2f");
|
pglMultiTexCoord2f = GetGLFunc("glMultiTexCoord2f");
|
||||||
pglClientActiveTexture = GetGLFunc("glClientActiveTexture");
|
pglClientActiveTexture = GetGLFunc("glClientActiveTexture");
|
||||||
pglMultiTexCoord2fv = GetGLFunc("glMultiTexCoord2fv");
|
pglMultiTexCoord2fv = GetGLFunc("glMultiTexCoord2fv");
|
||||||
|
|
||||||
|
/* 1.5 funcs */
|
||||||
pglGenBuffers = GetGLFunc("glGenBuffers");
|
pglGenBuffers = GetGLFunc("glGenBuffers");
|
||||||
pglBindBuffer = GetGLFunc("glBindBuffer");
|
pglBindBuffer = GetGLFunc("glBindBuffer");
|
||||||
pglBufferData = GetGLFunc("glBufferData");
|
pglBufferData = GetGLFunc("glBufferData");
|
||||||
|
@ -1434,7 +1433,7 @@ static const boolean gl_ext_arb_vertex_buffer_object = true;
|
||||||
|
|
||||||
// The texture offset to be applied to the texture coordinates in SkyVertex().
|
// The texture offset to be applied to the texture coordinates in SkyVertex().
|
||||||
static int rows, columns;
|
static int rows, columns;
|
||||||
static boolean yflip;
|
static signed char yflip;
|
||||||
static int texw, texh;
|
static int texw, texh;
|
||||||
static boolean foglayer;
|
static boolean foglayer;
|
||||||
static float delta = 0.0f;
|
static float delta = 0.0f;
|
||||||
|
|
|
@ -3379,10 +3379,10 @@ boolean P_AddWadFile(const char *wadfilename)
|
||||||
// WADs use markers for some resources, but others such as sounds are checked lump-by-lump anyway.
|
// WADs use markers for some resources, but others such as sounds are checked lump-by-lump anyway.
|
||||||
// UINT16 luaPos, luaNum = 0;
|
// UINT16 luaPos, luaNum = 0;
|
||||||
// UINT16 socPos, socNum = 0;
|
// UINT16 socPos, socNum = 0;
|
||||||
UINT16 sfxPos, sfxNum = 0;
|
UINT16 sfxPos = 0, sfxNum = 0;
|
||||||
UINT16 musPos = 0, musNum = 0;
|
UINT16 musPos = 0, musNum = 0;
|
||||||
// UINT16 sprPos, sprNum = 0;
|
// UINT16 sprPos, sprNum = 0;
|
||||||
UINT16 texPos, texNum = 0;
|
UINT16 texPos = 0, texNum = 0;
|
||||||
// UINT16 patPos, patNum = 0;
|
// UINT16 patPos, patNum = 0;
|
||||||
// UINT16 flaPos, flaNum = 0;
|
// UINT16 flaPos, flaNum = 0;
|
||||||
// UINT16 mapPos, mapNum = 0;
|
// UINT16 mapPos, mapNum = 0;
|
||||||
|
|
|
@ -23,13 +23,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define SWAP( a, b ) \
|
|
||||||
(\
|
|
||||||
(a) ^= (b),\
|
|
||||||
(b) ^= (a),\
|
|
||||||
(a) ^= (b)\
|
|
||||||
)
|
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
trycmp (char **pp, char *cp,
|
trycmp (char **pp, char *cp,
|
||||||
const char *q, size_t qn)
|
const char *q, size_t qn)
|
||||||
|
@ -45,8 +38,16 @@ trycmp (char **pp, char *cp,
|
||||||
static inline void
|
static inline void
|
||||||
swapp (char ***ppap, char ***ppbp, char **cpap, char **cpbp)
|
swapp (char ***ppap, char ***ppbp, char **cpap, char **cpbp)
|
||||||
{
|
{
|
||||||
SWAP(*(intptr_t *)ppap, *(intptr_t *)ppbp);
|
char **pp;
|
||||||
SWAP(*(intptr_t *)cpap, *(intptr_t *)cpbp);
|
char *p;
|
||||||
|
|
||||||
|
pp = *ppap;
|
||||||
|
*ppap = *ppbp;
|
||||||
|
*ppbp = pp;
|
||||||
|
|
||||||
|
p = *cpap;
|
||||||
|
*cpap = *cpbp;
|
||||||
|
*cpbp = p;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
|
|
Loading…
Reference in a new issue