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 f0f49ab8e7116a6dcf2abe4ac2c822c32d0e6e77..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,38 +19,36 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // vid.h -- video driver defs
 
-#define VID_CBITS      6
-#define VID_GRADES     (1 << VID_CBITS)
-
-// a pixel can be one, two, or four bytes
-typedef byte pixel_t;
-
-typedef struct vrect_s
-{
-       int                             x,y,width,height;
-       struct vrect_s  *pnext;
-} vrect_t;
+#ifndef VID_H
+#define VID_H
 
 typedef struct
 {
-       unsigned                width;          
-       unsigned                height;
-       float                   aspect;         // width / height -- < 0 is taller than wide
-       int                             recalc_refdef;  // if true, recalc vid-based stuff
-       unsigned                conwidth;
-       unsigned                conheight;
+       // 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;
 
 extern viddef_t        vid;                            // global video state
 extern void (*vid_menudrawfn)(void);
 extern void (*vid_menukeyfn)(int key);
 
+extern cvar_t vid_mode;
+extern cvar_t vid_mouse;
+extern cvar_t vid_fullscreen;
+
+void VID_InitCvars(void);
+
 void GL_Init (void);
 
-void VID_CheckMultitexture();
-void VID_CheckCVA();
+void VID_CheckExtensions(void);
 
-void   VID_Init ();
+void   VID_Init (void);
 // Called at startup
 
 void   VID_Shutdown (void);
@@ -59,3 +57,13 @@ void VID_Shutdown (void);
 int VID_SetMode (int modenum);
 // sets the mode; only used by the Quake engine for resetting to mode 0 (the
 // base mode) on memory allocation failures
+
+// 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
+