changed the boolean logic for the assert for the size of nk_draw_index
parent
2b03f44898
commit
26c6e246b7
|
@ -9370,10 +9370,8 @@ nk_draw_list_alloc_vertices(struct nk_draw_list *list, nk_size count)
|
||||||
* backend (OpenGL, DirectX, ...). For example in OpenGL for `glDrawElements`
|
* backend (OpenGL, DirectX, ...). For example in OpenGL for `glDrawElements`
|
||||||
* instead of specifing `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`.
|
* instead of specifing `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`.
|
||||||
* Sorry for the inconvenience. */
|
* Sorry for the inconvenience. */
|
||||||
#ifndef NK_UINT_DRAW_INDEX
|
if(sizeof(nk_draw_index)==2) NK_ASSERT((list->vertex_count < NK_USHORT_MAX &&
|
||||||
NK_ASSERT((sizeof(nk_draw_index) == 2 && list->vertex_count < NK_USHORT_MAX &&
|
|
||||||
"To many verticies for 16-bit vertex indicies. Please read comment above on how to solve this problem"));
|
"To many verticies for 16-bit vertex indicies. Please read comment above on how to solve this problem"));
|
||||||
#endif
|
|
||||||
return vtx;
|
return vtx;
|
||||||
}
|
}
|
||||||
NK_INTERN nk_draw_index*
|
NK_INTERN nk_draw_index*
|
||||||
|
|
|
@ -233,10 +233,8 @@ nk_draw_list_alloc_vertices(struct nk_draw_list *list, nk_size count)
|
||||||
* backend (OpenGL, DirectX, ...). For example in OpenGL for `glDrawElements`
|
* backend (OpenGL, DirectX, ...). For example in OpenGL for `glDrawElements`
|
||||||
* instead of specifing `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`.
|
* instead of specifing `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`.
|
||||||
* Sorry for the inconvenience. */
|
* Sorry for the inconvenience. */
|
||||||
#ifndef NK_UINT_DRAW_INDEX
|
if(sizeof(nk_draw_index)==2) NK_ASSERT((list->vertex_count < NK_USHORT_MAX &&
|
||||||
NK_ASSERT((sizeof(nk_draw_index) == 2 && list->vertex_count < NK_USHORT_MAX &&
|
|
||||||
"To many verticies for 16-bit vertex indicies. Please read comment above on how to solve this problem"));
|
"To many verticies for 16-bit vertex indicies. Please read comment above on how to solve this problem"));
|
||||||
#endif
|
|
||||||
return vtx;
|
return vtx;
|
||||||
}
|
}
|
||||||
NK_INTERN nk_draw_index*
|
NK_INTERN nk_draw_index*
|
||||||
|
|
Loading…
Reference in New Issue