From e77b723d98beb10a7e62829b80a0d582ad61e5f5 Mon Sep 17 00:00:00 2001 From: vurtun Date: Wed, 15 Mar 2017 18:19:21 +0100 Subject: [PATCH] Removed unused defines and parameters --- demo/glfw_opengl2/main.c | 5 +---- demo/glfw_opengl2/nuklear_glfw_gl2.h | 6 +++--- demo/sdl_opengl2/main.c | 5 +---- demo/sdl_opengl2/nuklear_sdl_gl2.h | 6 +++--- demo/sfml_opengl2/main.cpp | 5 +---- demo/sfml_opengl2/nuklear_sfml_gl2.h | 4 ++-- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/demo/glfw_opengl2/main.c b/demo/glfw_opengl2/main.c index bfdabed..2f6abde 100644 --- a/demo/glfw_opengl2/main.c +++ b/demo/glfw_opengl2/main.c @@ -27,9 +27,6 @@ #define WINDOW_WIDTH 1200 #define WINDOW_HEIGHT 800 -#define MAX_VERTEX_BUFFER 512 * 1024 -#define MAX_ELEMENT_BUFFER 128 * 1024 - #define UNUSED(a) (void)a #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) < (b) ? (b) : (a)) @@ -155,7 +152,7 @@ int main(void) * with blending, scissor, face culling and depth test and defaults everything * back into a default state. Make sure to either save and restore or * reset your own state after drawing rendering the UI. */ - nk_glfw3_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER); + nk_glfw3_render(NK_ANTI_ALIASING_ON); glfwSwapBuffers(win);} } nk_glfw3_shutdown(); diff --git a/demo/glfw_opengl2/nuklear_glfw_gl2.h b/demo/glfw_opengl2/nuklear_glfw_gl2.h index dc62fd3..f100db7 100644 --- a/demo/glfw_opengl2/nuklear_glfw_gl2.h +++ b/demo/glfw_opengl2/nuklear_glfw_gl2.h @@ -1,7 +1,7 @@ /* * Nuklear - v1.32.0 - public domain * no warrenty implied; use at your own risk. - * authored from 2015-2016 by Micha Mettke + * authored from 2015-2017 by Micha Mettke */ /* * ============================================================== @@ -24,7 +24,7 @@ NK_API void nk_glfw3_font_stash_begin(struct nk_font_atlas **atl NK_API void nk_glfw3_font_stash_end(void); NK_API void nk_glfw3_new_frame(void); -NK_API void nk_glfw3_render(enum nk_anti_aliasing , int max_vertex_buffer, int max_element_buffer); +NK_API void nk_glfw3_render(enum nk_anti_aliasing); NK_API void nk_glfw3_shutdown(void); NK_API void nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint); @@ -83,7 +83,7 @@ nk_glfw3_device_upload_atlas(const void *image, int width, int height) } NK_API void -nk_glfw3_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_buffer) +nk_glfw3_render(enum nk_anti_aliasing AA) { /* setup global state */ struct nk_glfw_device *dev = &glfw.ogl; diff --git a/demo/sdl_opengl2/main.c b/demo/sdl_opengl2/main.c index 75e8b8b..04f7866 100644 --- a/demo/sdl_opengl2/main.c +++ b/demo/sdl_opengl2/main.c @@ -28,9 +28,6 @@ #define WINDOW_WIDTH 1200 #define WINDOW_HEIGHT 800 -#define MAX_VERTEX_MEMORY 512 * 1024 -#define MAX_ELEMENT_MEMORY 128 * 1024 - #define UNUSED(a) (void)a #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) < (b) ? (b) : (a)) @@ -167,7 +164,7 @@ main(int argc, char* argv[]) * defaults everything back into a default state. * Make sure to either a.) save and restore or b.) reset your own state after * rendering the UI. */ - nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY); + nk_sdl_render(NK_ANTI_ALIASING_ON); SDL_GL_SwapWindow(win);} } diff --git a/demo/sdl_opengl2/nuklear_sdl_gl2.h b/demo/sdl_opengl2/nuklear_sdl_gl2.h index 28a1c15..6fa7a30 100644 --- a/demo/sdl_opengl2/nuklear_sdl_gl2.h +++ b/demo/sdl_opengl2/nuklear_sdl_gl2.h @@ -1,7 +1,7 @@ /* * Nuklear - 1.32.0 - public domain * no warrenty implied; use at your own risk. - * authored from 2015-2016 by Micha Mettke + * authored from 2015-2017 by Micha Mettke */ /* * ============================================================== @@ -18,7 +18,7 @@ NK_API struct nk_context* nk_sdl_init(SDL_Window *win); NK_API void nk_sdl_font_stash_begin(struct nk_font_atlas **atlas); NK_API void nk_sdl_font_stash_end(void); NK_API int nk_sdl_handle_event(SDL_Event *evt); -NK_API void nk_sdl_render(enum nk_anti_aliasing , int max_vertex_buffer, int max_element_buffer); +NK_API void nk_sdl_render(enum nk_anti_aliasing); NK_API void nk_sdl_shutdown(void); #endif @@ -63,7 +63,7 @@ nk_sdl_device_upload_atlas(const void *image, int width, int height) } NK_API void -nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_buffer) +nk_sdl_render(enum nk_anti_aliasing AA) { /* setup global state */ struct nk_sdl_device *dev = &sdl.ogl; diff --git a/demo/sfml_opengl2/main.cpp b/demo/sfml_opengl2/main.cpp index ac87696..065282a 100644 --- a/demo/sfml_opengl2/main.cpp +++ b/demo/sfml_opengl2/main.cpp @@ -28,9 +28,6 @@ #define WINDOW_WIDTH 1200 #define WINDOW_HEIGHT 800 -#define MAX_VERTEX_BUFFER 512 * 1024 -#define MAX_ELEMENT_BUFFER 128 * 1024 - #define UNUSED(a) (void)a #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) < (b) ? (b) : (a)) @@ -153,7 +150,7 @@ int main(void) * with blending, scissor, face culling and depth test and defaults everything * back into a default state. Make sure to either save and restore or * reset your own state after drawing rendering the UI. */ - nk_sfml_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER); + nk_sfml_render(NK_ANTI_ALIASING_ON); win.display(); } nk_sfml_shutdown(); diff --git a/demo/sfml_opengl2/nuklear_sfml_gl2.h b/demo/sfml_opengl2/nuklear_sfml_gl2.h index a322d79..b45258b 100644 --- a/demo/sfml_opengl2/nuklear_sfml_gl2.h +++ b/demo/sfml_opengl2/nuklear_sfml_gl2.h @@ -19,7 +19,7 @@ NK_API struct nk_context* nk_sfml_init(sf::Window* window); NK_API void nk_sfml_font_stash_begin(struct nk_font_atlas** atlas); NK_API void nk_sfml_font_stash_end(void); NK_API int nk_sfml_handle_event(sf::Event* event); -NK_API void nk_sfml_render(enum nk_anti_aliasing, int max_vertex_buffer, int max_element_buffer); +NK_API void nk_sfml_render(enum nk_anti_aliasing); NK_API void nk_sfml_shutdown(void); #endif @@ -64,7 +64,7 @@ nk_sfml_device_upload_atlas(const void* image, int width, int height) } NK_API void -nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_buffer) +nk_sfml_render(enum nk_anti_aliasing AA) { /* setup global state */ struct nk_sfml_device* dev = &sfml.ogl;