Merge pull request #284 from dariomanesku/master

Nanovg viewid fix + cleanup.

examples/common/imgui/imgui.cpp

@@ -813,6 +813,7 @@ struct Imgui
 	void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, char _inputChar, uint8_t _view)
 	{
 		IMGUI_beginFrame(_mx, _my, _button, _width, _height, _inputChar, _view);
+		nvgViewId(m_nvg, _view);
 
 		m_view = _view;
 		m_viewWidth = _width;

examples/common/imgui/ocornut_imgui.cpp

@@ -165,7 +165,7 @@ struct OcornutImguiContext
 
 		ImGui::NewFrame();
 
-		ImGui::ShowTestWindow();
+		//ImGui::ShowTestWindow(); //Debug only.
 	}
 
 	void endFrame()

examples/common/nanovg/nanovg.h

@@ -599,6 +599,7 @@ struct NVGparams {
 typedef struct NVGparams NVGparams;
 
 NVGcontext* nvgCreate(int edgeaa, unsigned char viewid);
+void nvgViewId(struct NVGcontext* ctx, unsigned char viewid);
 void nvgDelete(struct NVGcontext* ctx);
 
 // Contructor and destructor, called by the render back-end.

examples/common/nanovg/nanovg_bgfx.cpp

@@ -1051,6 +1051,13 @@ error:
 	return NULL;
 }
 
+void nvgViewId(struct NVGcontext* ctx, unsigned char viewid)
+{
+	struct NVGparams* params = nvgInternalParams(ctx);
+	struct GLNVGcontext* gl = (struct GLNVGcontext*)params->userPtr;
+	gl->viewid = uint8_t(viewid);
+}
+
 void nvgDelete(struct NVGcontext* ctx)
 {
 	nvgDeleteInternal(ctx);