DP code cleanup, stage one - all headers that can be protected by ifdef

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index f2757bbdec9607372e5c16b11fe6754a9a94e138..5b078578ecd8e1278b12ee99ac0a994ea57052a9 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,17 +19,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // vid.h -- video driver defs
 
-typedef struct vrect_s
-{
-       int                             x,y,width,height;
-       struct vrect_s  *pnext;
-} vrect_t;
+#ifndef VID_H
+#define VID_H
 
 typedef struct
 {
-       int             width;          
-       int             height;
-       int             recalc_refdef;  // if true, recalc vid-based stuff
+       // these are set with VID_GetWindowSize and can change from frame to frame
+       int             realx;
+       int             realy;
+       int             realwidth;
+       int             realheight;
+
        int             conwidth;
        int             conheight;
 } viddef_t;
@@ -46,8 +46,7 @@ void VID_InitCvars(void);
 
 void GL_Init (void);
 
-void VID_CheckMultitexture(void);
-void VID_CheckCVA(void);
+void VID_CheckExtensions(void);
 
 void   VID_Init (void);
 // Called at startup
@@ -61,3 +60,10 @@ int VID_SetMode (int modenum);
 
 // sets hardware gamma correction, returns false if the device does not support gamma control
 int VID_SetGamma (float prescale, float gamma, float scale, float base);
+
+void VID_GetWindowSize (int *x, int *y, int *width, int *height);
+
+void VID_Finish (void);
+
+#endif
+