Move font stuff out of q_shared.h

Author: slipher

src/engine/RefAPI.h

@@ -51,6 +51,32 @@ struct WindowConfig {
 	int vidWidth, vidHeight; // what the game is using
 };
 
+// font support
+struct glyphInfo_t
+{
+	int       height; // number of scan lines
+	int       top; // top of glyph in buffer
+	int       bottom; // bottom of glyph in buffer
+	int       pitch; // width for copying
+	int       xSkip; // x adjustment
+	int       imageWidth; // width of actual image
+	int       imageHeight; // height of actual image
+	float     s; // x offset in image where glyph starts
+	float     t; // y offset in image where glyph starts
+	float     s2;
+	float     t2;
+	qhandle_t glyph; // handle to the shader with the glyph
+	char      shaderName[ 32 ];
+};
+
+struct fontInfo_t
+{
+	void         *face, *faceData;
+	glyphInfo_t  *glyphBlock[0x110000 / 256]; // glyphBlock_t
+	int           pointSize;
+	char          name[ MAX_QPATH ];
+};
+
 //
 // these are the functions exported by the refresh module
 //

src/engine/qcommon/q_shared.h

@@ -2152,35 +2152,6 @@ union OpaquePlayerState {
 	  CA_ACTIVE, // game views should be displayed
 	};
 
-// font support
-
-struct glyphInfo_t
-{
-	int       height; // number of scan lines
-	int       top; // top of glyph in buffer
-	int       bottom; // bottom of glyph in buffer
-	int       pitch; // width for copying
-	int       xSkip; // x adjustment
-	int       imageWidth; // width of actual image
-	int       imageHeight; // height of actual image
-	float     s; // x offset in image where glyph starts
-	float     t; // y offset in image where glyph starts
-	float     s2;
-	float     t2;
-	qhandle_t glyph; // handle to the shader with the glyph
-	char      shaderName[ 32 ];
-};
-
-using glyphBlock_t = glyphInfo_t[256];
-
-struct fontInfo_t
-{
-	void         *face, *faceData;
-	glyphInfo_t  *glyphBlock[0x110000 / 256]; // glyphBlock_t
-	int           pointSize;
-	char          name[ MAX_QPATH ];
-};
-
 // real time
 //=============================================
 

src/engine/renderer/tr_font.cpp

@@ -50,6 +50,8 @@ Maryland 20850 USA.
 #define _CEIL( x )  ( ( ( x ) + 63 ) & - 64 )
 #define _TRUNC( x ) ( ( x ) >> 6 )
 
+using glyphBlock_t = glyphInfo_t[256];
+
 FT_Library ftLibrary = nullptr;
 
 static const int FONT_SIZE = 512;