disabled glBegin, glEnd, glPolygonMode wrapper functions in GLES2 init

[xonotic/darkplaces.git] / ft2.h

diff --git a/ft2.h b/ft2.h
index 99de79a74bd633106c818c8f9bf798d65f0ab254..e8110a72916263c87742039a6d410fe8e0d59fba 100644 (file)
--- a/ft2.h
+++ b/ft2.h
@@ -43,7 +43,7 @@ typedef struct ft2_font_s
 
        // TODO: clean this up and do not expose everything.
        
-       //unsigned char  *data;
+       const unsigned char  *data; // FT2 needs it to stay
        //fs_offset_t     datasize;
        void           *face;
 
@@ -55,6 +55,8 @@ typedef struct ft2_font_s
        size_t            attachmentcount;
        ft2_attachment_t *attachments;
 
+       ft2_settings_t *settings;
+
        // fallback mechanism
        struct ft2_font_s *next;
 } ft2_font_t;
@@ -72,7 +74,8 @@ ft2_font_map_t *Font_MapForIndex(ft2_font_t *font, int index);
 qboolean        Font_LoadFont(const char *name, dp_font_t *dpfnt);
 qboolean        Font_GetKerningForSize(ft2_font_t *font, float w, float h, Uchar left, Uchar right, float *outx, float *outy);
 qboolean        Font_GetKerningForMap(ft2_font_t *font, int map_index, float w, float h, Uchar left, Uchar right, float *outx, float *outy);
-
+float           Font_VirtualToRealSize(float sz);
+float           Font_SnapTo(float val, float snapwidth);
 // since this is used on a font_map_t, let's name it FontMap_*
 ft2_font_map_t *FontMap_FindForChar(ft2_font_map_t *start, Uchar ch);
 #endif // DP_FREETYPE2_H__