Merge branch 'master' of github.com:bkaradzic/bgfx

README.md

@@ -233,12 +233,10 @@ game in development. It's a combination of FPS and stealth.
 https://github.com/VladSerhiienko/FbxPipeline - Yet another FBX exporter with
 flatbuffers serialization.
 
-## FRAG
+## FRAG - Framework for Rather Awesome Games
 
-https://github.com/fragworks/frag - FRAG is a game creation framework being
-developed using the Nim programming language, and is currently in pre-alpha
-status. The immediate development focus for FRAG is supporting the creation of
-2D desktop games.
+http://fragworks.io/ - FRAG is a cross-platform 2D game creation framework for
+the Nim programming language.
 
 ## vg-renderer
 

examples/common/nanovg/nanovg.h

@@ -366,14 +366,6 @@ float nvgRadToDeg(float rad);
 // In addition you can upload your own image. The image loading is provided by stb_image.
 // The parameter imageFlags is combination of flags defined in NVGimageFlags.
 
-// Creates image by loading it from the disk from specified file name.
-// Returns handle to the image.
-int nvgCreateImage(NVGcontext* ctx, const char* filename, int imageFlags);
-
-// Creates image by loading it from the specified chunk of memory.
-// Returns handle to the image.
-int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, unsigned char* data, int ndata);
-
 // Creates image from specified image data.
 // Returns handle to the image.
 int nvgCreateImageRGBA(NVGcontext* ctx, int w, int h, int imageFlags, const unsigned char* data);