okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2

Browse source
This commit is contained in:
Zack Middleton 2014-02-07 23:24:12 -06:00
commit ed087bb89e
320 changed files with 18335 additions and 9574 deletions
Download patch file Download diff file Expand all files Collapse all files

102
code/renderergl2/tr_local.h
View file

@ -526,83 +526,6 @@ enum
ATTR_INDEX_NORMAL2 = 12
};
enum
{
GLS_SRCBLEND_ZERO = (1 << 0),
GLS_SRCBLEND_ONE = (1 << 1),
GLS_SRCBLEND_DST_COLOR = (1 << 2),
GLS_SRCBLEND_ONE_MINUS_DST_COLOR = (1 << 3),
GLS_SRCBLEND_SRC_ALPHA = (1 << 4),
GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA = (1 << 5),
GLS_SRCBLEND_DST_ALPHA = (1 << 6),
GLS_SRCBLEND_ONE_MINUS_DST_ALPHA = (1 << 7),
GLS_SRCBLEND_ALPHA_SATURATE = (1 << 8),
GLS_SRCBLEND_BITS = GLS_SRCBLEND_ZERO
| GLS_SRCBLEND_ONE
| GLS_SRCBLEND_DST_COLOR
| GLS_SRCBLEND_ONE_MINUS_DST_COLOR
| GLS_SRCBLEND_SRC_ALPHA
| GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA
| GLS_SRCBLEND_DST_ALPHA
| GLS_SRCBLEND_ONE_MINUS_DST_ALPHA
| GLS_SRCBLEND_ALPHA_SATURATE,
GLS_DSTBLEND_ZERO = (1 << 9),
GLS_DSTBLEND_ONE = (1 << 10),
GLS_DSTBLEND_SRC_COLOR = (1 << 11),
GLS_DSTBLEND_ONE_MINUS_SRC_COLOR = (1 << 12),
GLS_DSTBLEND_SRC_ALPHA = (1 << 13),
GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA = (1 << 14),
GLS_DSTBLEND_DST_ALPHA = (1 << 15),
GLS_DSTBLEND_ONE_MINUS_DST_ALPHA = (1 << 16),
GLS_DSTBLEND_BITS = GLS_DSTBLEND_ZERO
| GLS_DSTBLEND_ONE
| GLS_DSTBLEND_SRC_COLOR
| GLS_DSTBLEND_ONE_MINUS_SRC_COLOR
| GLS_DSTBLEND_SRC_ALPHA
| GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA
| GLS_DSTBLEND_DST_ALPHA
| GLS_DSTBLEND_ONE_MINUS_DST_ALPHA,
GLS_DEPTHMASK_TRUE = (1 << 17),
GLS_POLYMODE_LINE = (1 << 18),
GLS_DEPTHTEST_DISABLE = (1 << 19),
GLS_DEPTHFUNC_LESS = (1 << 20),
GLS_DEPTHFUNC_EQUAL = (1 << 21),
GLS_DEPTHFUNC_BITS = GLS_DEPTHFUNC_LESS
| GLS_DEPTHFUNC_EQUAL,
GLS_ATEST_GT_0 = (1 << 22),
GLS_ATEST_LT_128 = (1 << 23),
GLS_ATEST_GE_128 = (1 << 24),
// GLS_ATEST_GE_CUSTOM = (1 << 25),
GLS_ATEST_BITS = GLS_ATEST_GT_0
| GLS_ATEST_LT_128
| GLS_ATEST_GE_128,
// | GLS_ATEST_GT_CUSTOM,
GLS_REDMASK_FALSE = (1 << 26),
GLS_GREENMASK_FALSE = (1 << 27),
GLS_BLUEMASK_FALSE = (1 << 28),
GLS_ALPHAMASK_FALSE = (1 << 29),
GLS_COLORMASK_BITS = GLS_REDMASK_FALSE
| GLS_GREENMASK_FALSE
| GLS_BLUEMASK_FALSE
| GLS_ALPHAMASK_FALSE,
GLS_STENCILTEST_ENABLE = (1 << 30),
GLS_DEFAULT = GLS_DEPTHMASK_TRUE
};
enum
{
ATTR_POSITION = 0x0001,
@ -924,7 +847,6 @@ typedef enum {
SF_TRIANGLES,
SF_POLY,
SF_MDV,
SF_MD4,
SF_MDR,
SF_IQM,
SF_FLARE,
@ -1342,7 +1264,6 @@ typedef enum {
MOD_BAD,
MOD_BRUSH,
MOD_MESH,
MOD_MD4,
MOD_MDR,
MOD_IQM
} modtype_t;
@ -1355,7 +1276,7 @@ typedef struct model_s {
int dataSize; // just for listing purposes
bmodel_t *bmodel; // only if type == MOD_BRUSH
mdvModel_t *mdv[MD3_MAX_LODS]; // only if type == MOD_MESH
void *modelData; // only if type == (MOD_MD4 | MOD_MDR | MOD_IQM)
void *modelData; // only if type == (MOD_MDR | MOD_IQM)
int numLods;
} model_t;
@ -1502,6 +1423,8 @@ typedef struct {
qboolean depthClamp;
qboolean seamlessCubeMap;
GLenum packedNormalDataType;
} glRefConfig_t;
@ -1800,6 +1723,7 @@ extern cvar_t *r_ext_texture_float;
extern cvar_t *r_arb_half_float_pixel;
extern cvar_t *r_ext_framebuffer_multisample;
extern cvar_t *r_arb_seamless_cube_map;
extern cvar_t *r_arb_vertex_type_2_10_10_10_rev;
extern cvar_t *r_nobind; // turns off binding to appropriate textures
extern cvar_t *r_singleShader; // make most world faces use default shader
@ -1893,6 +1817,7 @@ extern cvar_t *r_shadowMapSize;
extern cvar_t *r_shadowCascadeZNear;
extern cvar_t *r_shadowCascadeZFar;
extern cvar_t *r_shadowCascadeZBias;
extern cvar_t *r_ignoreDstAlpha;
extern cvar_t *r_greyscale;
@ -2086,13 +2011,13 @@ typedef struct shaderCommands_s
{
glIndex_t indexes[SHADER_MAX_INDEXES] QALIGN(16);
vec4_t xyz[SHADER_MAX_VERTEXES] QALIGN(16);
uint8_t normal[SHADER_MAX_VERTEXES][4] QALIGN(16);
uint32_t normal[SHADER_MAX_VERTEXES] QALIGN(16);
#ifdef USE_VERT_TANGENT_SPACE
uint8_t tangent[SHADER_MAX_VERTEXES][4] QALIGN(16);
uint32_t tangent[SHADER_MAX_VERTEXES] QALIGN(16);
#endif
vec2_t texCoords[SHADER_MAX_VERTEXES][2] QALIGN(16);
vec4_t vertexColors[SHADER_MAX_VERTEXES] QALIGN(16);
vec4_t lightdir[SHADER_MAX_VERTEXES] QALIGN(16);
uint32_t lightdir[SHADER_MAX_VERTEXES] QALIGN(16);
//int vertexDlightBits[SHADER_MAX_VERTEXES] QALIGN(16);
VBO_t *vbo;
@ -2256,6 +2181,12 @@ VERTEX BUFFER OBJECTS
============================================================
*/
uint32_t R_VboPackTangent(vec4_t v);
uint32_t R_VboPackNormal(vec3_t v);
void R_VboUnpackTangent(vec4_t v, uint32_t b);
void R_VboUnpackNormal(vec3_t v, uint32_t b);
VBO_t *R_CreateVBO(const char *name, byte * vertexes, int vertexesSize, vboUsage_t usage);
VBO_t *R_CreateVBO2(const char *name, int numVertexes, srfVert_t * vertexes, uint32_t stateBits, vboUsage_t usage);
@ -2346,11 +2277,8 @@ ANIMATED MODELS
=============================================================
*/
// void R_MakeAnimModel( model_t *model ); haven't seen this one really, so not needed I guess.
void R_AddAnimSurfaces( trRefEntity_t *ent );
void RB_SurfaceAnim( md4Surface_t *surfType );
void R_MDRAddAnimSurfaces( trRefEntity_t *ent );
void RB_MDRSurfaceAnim( md4Surface_t *surface );
void RB_MDRSurfaceAnim( mdrSurface_t *surface );
qboolean R_LoadIQM (model_t *mod, void *buffer, int filesize, const char *name );
void R_AddIQMSurfaces( trRefEntity_t *ent );
void RB_IQMSurfaceAnim( surfaceType_t *surface );