Merge pull request #104 from starwing/master

fix nvgCreateImageFromHandle for GLES2/3.

src/nanovg_gl.h

@@ -78,7 +78,7 @@ enum NVGLtextureflags {
 	NVGL_TEXTURE_PREMULTIPLIED = 0x04,
 };
 
-int nvglCreateImageFromHandle(struct NVGcontext* ctx, GLuint textureId, int flags);
+int nvglCreateImageFromHandle(struct NVGcontext* ctx, GLuint textureId, int w, int h, int flags);
 GLuint nvglImageHandle(struct NVGcontext* ctx, int image);
 void nvglImageFlags(struct NVGcontext* ctx, int image, int flags);
 
@@ -1395,20 +1395,18 @@ void nvgDeleteGLES3(struct NVGcontext* ctx)
 	nvgDeleteInternal(ctx);
 }
 
-int nvglCreateImageFromHandle(struct NVGcontext* ctx, GLuint textureId, int flags)
+int nvglCreateImageFromHandle(struct NVGcontext* ctx, GLuint textureId, int w, int h, int flags)
 {
 	struct GLNVGcontext* gl = (struct GLNVGcontext*)nvgInternalParams(ctx)->userPtr;
 	struct GLNVGtexture* tex = glnvg__allocTexture(gl);
 
 	if (tex == NULL) return 0;
 
-	tex->tex = textureId;
 	tex->type = NVG_TEXTURE_RGBA;
-    tex->flags = flags;
-	glBindTexture(GL_TEXTURE_2D, tex->tex);
-	glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &tex->width);
-	glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &tex->height);
-	glBindTexture(GL_TEXTURE_2D, 0);
+	tex->tex = textureId;
+	tex->flags = flags;
+	tex->width = w;
+	tex->height = h;
 
 	return tex->id;
 }