From 1458f61a4891c873bd98b6d9deffdd28e41721e4 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 17 Mar 2022 10:51:29 +0900 Subject: [PATCH] [renderer] Fix non-static linking of graph code Obviously forgot to test the changes I made to graph rendering in non-static builds. Oops :P --- libs/video/renderer/Makemodule.am | 2 +- libs/video/renderer/r_graph.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am index 1b6bd2ab0..44d8bd5ac 100644 --- a/libs/video/renderer/Makemodule.am +++ b/libs/video/renderer/Makemodule.am @@ -31,7 +31,6 @@ video_renderer_common_sources = \ libs/video/renderer/r_bsp.c \ libs/video/renderer/r_dyn_textures.c \ libs/video/renderer/r_ent.c \ - libs/video/renderer/r_graph.c \ libs/video/renderer/r_iqm.c \ libs/video/renderer/r_part.c \ libs/video/renderer/r_sprite.c \ @@ -48,6 +47,7 @@ libs_video_renderer_libQFrenderer_la_SOURCES=\ libs/video/renderer/r_cvar.c \ libs/video/renderer/r_efrag.c \ libs/video/renderer/r_fog.c \ + libs/video/renderer/r_graph.c \ libs/video/renderer/r_init.c \ libs/video/renderer/r_light.c \ libs/video/renderer/r_main.c \ diff --git a/libs/video/renderer/r_graph.c b/libs/video/renderer/r_graph.c index c831780a5..4c309aacf 100644 --- a/libs/video/renderer/r_graph.c +++ b/libs/video/renderer/r_graph.c @@ -78,8 +78,8 @@ R_TimeGraph (view_t *view) a = 0; } memcpy (timings + o, r_timings + a, l * sizeof (timings[0])); - vr_funcs->R_LineGraph (view->xabs, view->yabs, r_timings, - MAX_TIMINGS, 200);//vr_data.graphheight->int_val); + r_funcs->R_LineGraph (view->xabs, view->yabs, r_timings, + MAX_TIMINGS, 200);//r_data->graphheight->int_val); timex = (timex + 1) % MAX_TIMINGS; } @@ -97,6 +97,6 @@ R_ZGraph (view_t *view) height[r_framecount & 255] = ((int) r_refdef.frame.position[2]) & 31; - vr_funcs->R_LineGraph (view->xabs, view->yabs, height, - w, vr_data.graphheight->int_val); + r_funcs->R_LineGraph (view->xabs, view->yabs, height, + w, r_data->graphheight->int_val); }