imported changes from love-0.9.2

jni/love/src/modules/graphics/opengl/Graphics.h

@@ -193,15 +193,8 @@ public:
 	 **/
 	Color getBackgroundColor() const;
 
-	/**
-	 * Sets the current font.
-	 * @param font A Font object.
-	 **/
 	void setFont(Font *font);
-	/**
-	 * Gets the current Font, or nil if none.
-	 **/
-	Font *getFont() const;
+	Font *getFont();
 
 	void setShader(Shader *shader);
 	void setShader();
@@ -210,7 +203,7 @@ public:
 
 	void setCanvas(Canvas *canvas);
 	void setCanvas(const std::vector<Canvas *> &canvases);
-	void setCanvas(const std::vector<Object::StrongRef<Canvas>> &canvases);
+	void setCanvas(const std::vector<StrongRef<Canvas>> &canvases);
 	void setCanvas();
 
 	std::vector<Canvas *> getCanvas() const;
@@ -218,13 +211,12 @@ public:
 	/**
 	 * Sets the enabled color components when rendering.
 	 **/
-	void setColorMask(const bool mask[4]);
+	void setColorMask(ColorMask mask);
 
 	/**
 	 * Gets the current color mask.
-	 * Returns an array of 4 booleans representing the mask.
 	 **/
-	const bool *getColorMask() const;
+	ColorMask getColorMask() const;
 
 	/**
 	 * Sets the current blend mode.
@@ -447,40 +439,32 @@ private:
 
 	struct DisplayState
 	{
-		// Colors.
 		Color color;
 		Color backgroundColor;
 
-		// Blend mode.
 		BlendMode blendMode;
 
-		// Line.
 		float lineWidth;
 		LineStyle lineStyle;
 		LineJoin lineJoin;
 
-		// Point.
 		float pointSize;
 		PointStyle pointStyle;
 
-		// Scissor.
 		bool scissor;
 		OpenGL::Viewport scissorBox;
 
-		Object::StrongRef<Font> font;
-		Object::StrongRef<Shader> shader;
+		StrongRef<Font> font;
+		StrongRef<Shader> shader;
 
-		std::vector<Object::StrongRef<Canvas>> canvases;
+		std::vector<StrongRef<Canvas>> canvases;
 
-		// Color mask.
-		bool colorMask[4];
+		ColorMask colorMask;
 
 		bool wireframe;
 
-		// Default filter.
 		Texture::Filter defaultFilter;
 
-		// Default mipmap filter and sharpness.
 		Texture::FilterMode defaultMipmapFilter;
 		float defaultMipmapSharpness;
 
@@ -494,8 +478,12 @@ private:
 	void restoreState(const DisplayState &s);
 	void restoreStateChecked(const DisplayState &s);
 
+	void checkSetDefaultFont();
+
 	love::window::Window *currentWindow;
 
+	StrongRef<Font> defaultFont;
+
 	std::vector<double> pixel_size_stack; // stores current size of a pixel (needed for line drawing)
 
 	int width;