From 98a8ce445c7f799f9e56d56f72ab68f83a994995 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Fri, 28 Aug 2015 23:06:16 -0700 Subject: [PATCH] Minor tweak --- docs/ImportAll.hx | 3 ++- lime/graphics/opengl/GL.hx | 2 +- project/src/graphics/opengl/OpenGLBindings.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/ImportAll.hx b/docs/ImportAll.hx index 94d39756e..fc6d74c8e 100644 --- a/docs/ImportAll.hx +++ b/docs/ImportAll.hx @@ -26,9 +26,10 @@ import lime.graphics.cairo.CairoContent; import lime.graphics.cairo.CairoExtend; import lime.graphics.cairo.CairoFillRule; import lime.graphics.cairo.CairoFilter; -import lime.graphics.cairo.CairoFont; +import lime.graphics.cairo.CairoFontFace; import lime.graphics.cairo.CairoFontOptions; import lime.graphics.cairo.CairoFormat; +import lime.graphics.cairo.CairoFTFontFace; import lime.graphics.cairo.CairoHintMetrics; import lime.graphics.cairo.CairoImageSurface; import lime.graphics.cairo.CairoLineCap; diff --git a/lime/graphics/opengl/GL.hx b/lime/graphics/opengl/GL.hx index ee639626d..2dcf4f83d 100644 --- a/lime/graphics/opengl/GL.hx +++ b/lime/graphics/opengl/GL.hx @@ -2298,7 +2298,7 @@ class GL { private static var lime_gl_stencil_op = System.loadPrime ("lime", "lime_gl_stencil_op", "iiiv"); private static var lime_gl_stencil_op_separate = System.loadPrime ("lime", "lime_gl_stencil_op_separate", "iiiiv"); private static var lime_gl_tex_image_2d = System.loadPrime ("lime", "lime_gl_tex_image_2d", "iiiiiiiioiv"); - private static var lime_gl_tex_parameterf = System.loadPrime ("lime", "lime_gl_tex_parameterf", "iidv"); + private static var lime_gl_tex_parameterf = System.loadPrime ("lime", "lime_gl_tex_parameterf", "iifv"); private static var lime_gl_tex_parameteri = System.loadPrime ("lime", "lime_gl_tex_parameteri", "iiiv"); private static var lime_gl_tex_sub_image_2d = System.loadPrime ("lime", "lime_gl_tex_sub_image_2d", "iiiiiiiioiv"); private static var lime_gl_uniform1f = System.loadPrime ("lime", "lime_gl_uniform1f", "ifv"); diff --git a/project/src/graphics/opengl/OpenGLBindings.cpp b/project/src/graphics/opengl/OpenGLBindings.cpp index 12c516af1..6f8710bbb 100644 --- a/project/src/graphics/opengl/OpenGLBindings.cpp +++ b/project/src/graphics/opengl/OpenGLBindings.cpp @@ -1219,7 +1219,7 @@ namespace lime { } - void lime_gl_tex_parameterf (int inTarget, int inPName, double inVal) { + void lime_gl_tex_parameterf (int inTarget, int inPName, float inVal) { glTexParameterf (inTarget, inPName, inVal);