Browse Source

Merge pull request #32 from jtilander/master

Quick guard against NULL ptr dereference of texture type on CPU side
shared-context
Mikko Mononen 11 years ago
parent
commit
9ad2fa14ae
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      src/nanovg_gl2.h

+ 1
- 1
src/nanovg_gl2.h View File

@@ -856,7 +856,7 @@ static void glnvg__renderTriangles(void* uptr, struct NVGpaint* paint, struct NV
glUniform1i(gl->shader.loc[GLNVG_LOC_TYPE], NSVG_SHADER_IMG);
glUniform2f(gl->shader.loc[GLNVG_LOC_VIEWSIZE], gl->viewWidth, gl->viewHeight);
glUniform1i(gl->shader.loc[GLNVG_LOC_TEX], 0);
glUniform1i(gl->shader.loc[GLNVG_LOC_TEXTYPE], tex->type == NVG_TEXTURE_RGBA ? 0 : 1);
glUniform1i(gl->shader.loc[GLNVG_LOC_TEXTYPE], (tex != NULL && tex->type == NVG_TEXTURE_RGBA) ? 0 : 1);
glnvg__checkError("tris solid img loc");

glBindBuffer(GL_ARRAY_BUFFER, gl->vertBuf);


Loading…
Cancel
Save