Rename more null variables to tex_null
This commit is contained in:
parent
54fd67bddd
commit
ca49016428
|
@ -140,7 +140,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA)
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -266,7 +266,7 @@ nk_glfw3_render(struct nk_glfw* glfw, enum nk_anti_aliasing AA, int max_vertex_b
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -407,7 +407,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA)
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -120,7 +120,7 @@ nk_sdl_render(enum nk_anti_aliasing AA)
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -247,7 +247,7 @@ nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -245,7 +245,7 @@ nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -113,7 +113,7 @@ nk_sdl_render(enum nk_anti_aliasing AA)
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -118,7 +118,7 @@ nk_sfml_render(enum nk_anti_aliasing AA)
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_sfml_vertex);
|
config.vertex_size = sizeof(struct nk_sfml_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sfml_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_sfml_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -248,7 +248,7 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_sfml_vertex);
|
config.vertex_size = sizeof(struct nk_sfml_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sfml_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_sfml_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -153,7 +153,7 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_x11_vertex);
|
config.vertex_size = sizeof(struct nk_x11_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_x11_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_x11_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -536,7 +536,7 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_x11_vertex);
|
config.vertex_size = sizeof(struct nk_x11_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_x11_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_x11_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -637,7 +637,7 @@ cfg.circle_segment_count = 22;
|
||||||
cfg.curve_segment_count = 22;
|
cfg.curve_segment_count = 22;
|
||||||
cfg.arc_segment_count = 22;
|
cfg.arc_segment_count = 22;
|
||||||
cfg.global_alpha = 1.0f;
|
cfg.global_alpha = 1.0f;
|
||||||
cfg.tex_null = dev->null;
|
cfg.tex_null = dev->tex_null;
|
||||||
//
|
//
|
||||||
// setup buffers and convert
|
// setup buffers and convert
|
||||||
struct nk_buffer cmds, verts, idx;
|
struct nk_buffer cmds, verts, idx;
|
||||||
|
|
|
@ -262,7 +262,7 @@ device_draw(struct device *dev, struct nk_context *ctx, int width, int height,
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -685,7 +685,7 @@ device_draw(struct device *dev, struct nk_context *ctx, int width, int height,
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -722,7 +722,7 @@ device_draw(struct device *dev, struct nk_context *ctx, int width, int height,
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
|
@ -286,7 +286,7 @@ device_draw(struct device *dev, struct nk_context *ctx, int width, int height,
|
||||||
config.vertex_layout = vertex_layout;
|
config.vertex_layout = vertex_layout;
|
||||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||||
config.tex_null = dev->null;
|
config.tex_null = dev->tex_null;
|
||||||
config.circle_segment_count = 22;
|
config.circle_segment_count = 22;
|
||||||
config.curve_segment_count = 22;
|
config.curve_segment_count = 22;
|
||||||
config.arc_segment_count = 22;
|
config.arc_segment_count = 22;
|
||||||
|
|
Loading…
Reference in New Issue