SSE patch by kyre, with runtime CPU detection and a cvar r_skeletal_use_sse if SSE...

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 0666a096ff75cb3ec4aee3635f38fbe532317b05..848e44277a603866363f6b5308a257cc73edf502 100644 (file)
--- a/client.h
+++ b/client.h
@@ -368,11 +368,6 @@ typedef struct entity_render_s
        float *animcache_normal3f;
        float *animcache_svector3f;
        float *animcache_tvector3f;
-       // interleaved arrays for rendering and dynamic vertex buffers for them
-       r_vertexposition_t *animcache_vertexposition;
-       r_meshbuffer_t *animcache_vertexpositionbuffer;
-       r_vertexmesh_t *animcache_vertexmesh;
-       r_meshbuffer_t *animcache_vertexmeshbuffer;
 
        // current lighting from map (updated ONLY by client code, not renderer)
        vec3_t modellight_ambient;
@@ -710,6 +705,9 @@ typedef struct client_static_s
        // password spectator name team skin topcolor bottomcolor rate noaim msg *ver *ip
        char userinfo[MAX_USERINFO_STRING];
 
+       // extra user info for the "connect" command
+       char connect_userinfo[MAX_USERINFO_STRING];
+
        // video capture stuff
        capturevideostate_t capturevideo;
 }
@@ -1200,6 +1198,7 @@ typedef struct client_state_s
        float movevars_airstrafeaccel_qw;
        float movevars_aircontrol;
        float movevars_aircontrol_power;
+       float movevars_aircontrol_penalty;
        float movevars_warsowbunny_airforwardaccel;
        float movevars_warsowbunny_accel;
        float movevars_warsowbunny_topspeed;
@@ -1333,7 +1332,7 @@ void CL_Locs_FindLocationName(char *buffer, size_t buffersize, vec3_t point);
 void CL_Shutdown (void);
 void CL_Init (void);
 
-void CL_EstablishConnection(const char *host);
+void CL_EstablishConnection(const char *host, int firstarg);
 
 void CL_Disconnect (void);
 void CL_Disconnect_f (void);
@@ -1552,10 +1551,6 @@ typedef struct r_refdef_stats_s
        int bloom;
        int bloom_copypixels;
        int bloom_drawpixels;
-       int indexbufferuploadcount;
-       int indexbufferuploadsize;
-       int vertexbufferuploadcount;
-       int vertexbufferuploadsize;
 }
 r_refdef_stats_t;
 
@@ -1774,7 +1769,7 @@ typedef struct r_refdef_s
        float fog_height_texcoordscale;
        char fogheighttexturename[64]; // detects changes to active fog height texture
 
-       qboolean draw2dstage;
+       int draw2dstage; // 0 = no, 1 = yes, other value = needs setting up again
 
        // true during envmap command capture
        qboolean envmap;