瀏覽代碼

Properly cleanup all resources and remove some obsolete comments.

Martijn Versteegh 5 年之前
父節點
當前提交
7fea82f534
共有 2 個文件被更改,包括 7 次插入8 次删除
  1. 3 5
      demo/sdl2surface_rawfb/main.c
  2. 4 3
      demo/sdl2surface_rawfb/sdl2surface_rawfb.h

+ 3 - 5
demo/sdl2surface_rawfb/main.c

@@ -182,8 +182,6 @@ int main(int argc, char **argv)
         nk_sdlsurface_render(context, clear, 1);
 
 
-//      SDL_Rect rect = {100, 100, 200, 100};
-//      SDL_FillRect(surface, &rect, 0x00FF00FF);
 
 
         SDL_Texture *tex = SDL_CreateTextureFromSurface(renderer, surface);
@@ -191,13 +189,13 @@ int main(int argc, char **argv)
         SDL_RenderPresent(renderer);
         SDL_DestroyTexture(tex);
 
-        //sdl blit surface
-        // sdl_renderer present
     }
 
     nk_sdlsurface_shutdown(context);
 
-    //! todo destroy rest of state
+    SDL_FreeSurface(surface);
+    SDL_DestroyRenderer(renderer);
+    SDL_DestroyWindow(window);
 }
 
 

+ 4 - 3
demo/sdl2surface_rawfb/sdl2surface_rawfb.h

@@ -999,9 +999,10 @@ NK_API void
 nk_sdlsurface_shutdown(struct sdlsurface_context *sdlsurface)
 {
     if (sdlsurface) {
-    nk_free(&sdlsurface->ctx);
-    NK_MEMSET(sdlsurface, 0, sizeof(struct sdlsurface_context));
-    free(sdlsurface);
+        SDL_FreeSurface(sdlsurface->font_tex);
+        nk_free(&sdlsurface->ctx);
+        NK_MEMSET(sdlsurface, 0, sizeof(struct sdlsurface_context));
+        free(sdlsurface);
     }
 }