Skip to content

Commit b1967b2

Browse files
WhiteNinjaZWhiteNinjaZ
committed
fixed compiler warnings
1 parent 51e32ce commit b1967b2

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

‎vpr/src/draw/draw_basic.cpp‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -641,21 +641,18 @@ void draw_partial_route(const std::vector<int>& rr_nodes_to_draw, ezgl::renderer
641641
if (draw_state->draw_route_type == GLOBAL)
642642
chanx_track[rr_graph.node_xlow(rr_node)][rr_graph.node_ylow(rr_node)]++;
643643

644-
int itrack = get_track_num(inode, chanx_track, chany_track);
645644
draw_rr_chan(inode, draw_state->draw_rr_node[inode].color, g);
646645

647646
switch (prev_type) {
648647
case CHANX: {
649648
draw_chanx_to_chanx_edge(RRNodeId(prev_node), RRNodeId(inode),
650-
itrack, switch_type, g);
649+
switch_type, g);
651650
break;
652651
}
653652
case CHANY: {
654-
int prev_track = get_track_num(prev_node, chanx_track,
655-
chany_track);
656-
draw_chanx_to_chany_edge(inode, itrack, prev_node,
653+
draw_chanx_to_chany_edge(inode, prev_node,
657654

658-
prev_track, FROM_Y_TO_X, switch_type, g);
655+
FROM_Y_TO_X, switch_type, g);
659656
break;
660657
}
661658
case OPIN: {
@@ -675,20 +672,17 @@ void draw_partial_route(const std::vector<int>& rr_nodes_to_draw, ezgl::renderer
675672
if (draw_state->draw_route_type == GLOBAL)
676673
chany_track[rr_graph.node_xlow(rr_node)][rr_graph.node_ylow(rr_node)]++;
677674

678-
int itrack = get_track_num(inode, chanx_track, chany_track);
679675
draw_rr_chan(inode, draw_state->draw_rr_node[inode].color, g);
680676

681677
switch (prev_type) {
682678
case CHANX: {
683-
int prev_track = get_track_num(prev_node, chanx_track,
684-
chany_track);
685-
draw_chanx_to_chany_edge(prev_node, prev_track, inode,
686-
itrack, FROM_X_TO_Y, switch_type, g);
679+
draw_chanx_to_chany_edge(prev_node, inode,
680+
FROM_X_TO_Y, switch_type, g);
687681
break;
688682
}
689683
case CHANY: {
690684
draw_chany_to_chany_edge(RRNodeId(prev_node), RRNodeId(inode),
691-
itrack, switch_type, g);
685+
switch_type, g);
692686
break;
693687
}
694688
case OPIN: {

‎vpr/src/draw/draw_rr.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ void draw_rr_edges(int inode, ezgl::renderer* g) {
396396
}
397397
switch_type = rr_graph.edge_switch(rr_node, iedge);
398398
draw_chanx_to_chanx_edge(rr_node, RRNodeId(to_node),
399-
to_ptc_num, switch_type, g);
399+
switch_type, g);
400400
break;
401401

402402
case CHANY:
@@ -412,8 +412,8 @@ void draw_rr_edges(int inode, ezgl::renderer* g) {
412412
g->set_color(blk_DARKGREEN);
413413
}
414414
switch_type = rr_graph.edge_switch(rr_node, iedge);
415-
draw_chanx_to_chany_edge(inode, from_ptc_num, to_node,
416-
to_ptc_num, FROM_X_TO_Y, switch_type, g);
415+
draw_chanx_to_chany_edge(inode, to_node,
416+
FROM_X_TO_Y, switch_type, g);
417417
break;
418418

419419
default:
@@ -465,8 +465,8 @@ void draw_rr_edges(int inode, ezgl::renderer* g) {
465465
g->set_color(blk_DARKGREEN);
466466
}
467467
switch_type = rr_graph.edge_switch(rr_node, iedge);
468-
draw_chanx_to_chany_edge(to_node, to_ptc_num, inode,
469-
from_ptc_num, FROM_Y_TO_X, switch_type, g);
468+
draw_chanx_to_chany_edge(to_node, inode,
469+
FROM_Y_TO_X, switch_type, g);
470470
break;
471471

472472
case CHANY:
@@ -484,7 +484,7 @@ void draw_rr_edges(int inode, ezgl::renderer* g) {
484484
}
485485
switch_type = rr_graph.edge_switch(rr_node, iedge);
486486
draw_chany_to_chany_edge(rr_node, RRNodeId(to_node),
487-
to_ptc_num, switch_type, g);
487+
switch_type, g);
488488
break;
489489

490490
default:

‎vpr/src/draw/draw_rr_edges.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
# include <X11/keysym.h>
5555
# endif
5656

57-
void draw_chany_to_chany_edge(RRNodeId from_node, RRNodeId to_node, int to_track, short switch_type, ezgl::renderer* g) {
57+
void draw_chany_to_chany_edge(RRNodeId from_node, RRNodeId to_node, short switch_type, ezgl::renderer* g) {
5858
t_draw_state* draw_state = get_draw_state_vars();
5959
t_draw_coords* draw_coords = get_draw_coords_vars();
6060
auto& device_ctx = g_vpr_ctx.device();
@@ -144,7 +144,7 @@ void draw_chany_to_chany_edge(RRNodeId from_node, RRNodeId to_node, int to_track
144144
}
145145
}
146146

147-
void draw_chanx_to_chanx_edge(RRNodeId from_node, RRNodeId to_node, int to_track, short switch_type, ezgl::renderer* g) {
147+
void draw_chanx_to_chanx_edge(RRNodeId from_node, RRNodeId to_node, short switch_type, ezgl::renderer* g) {
148148
/* Draws a connection between two x-channel segments. Passing in the track *
149149
* numbers allows this routine to be used for both rr_graph and routing *
150150
* drawing-> */
@@ -236,7 +236,7 @@ void draw_chanx_to_chanx_edge(RRNodeId from_node, RRNodeId to_node, int to_track
236236
}
237237
}
238238

239-
void draw_chanx_to_chany_edge(int chanx_node, int chanx_track, int chany_node, int chany_track, enum e_edge_dir edge_dir, short switch_type, ezgl::renderer* g) {
239+
void draw_chanx_to_chany_edge(int chanx_node, int chany_node, enum e_edge_dir edge_dir, short switch_type, ezgl::renderer* g) {
240240
t_draw_state* draw_state = get_draw_state_vars();
241241
t_draw_coords* draw_coords = get_draw_coords_vars();
242242
auto& device_ctx = g_vpr_ctx.device();

‎vpr/src/draw/draw_rr_edges.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
# include "place_macro.h"
4848
# include "buttons.h"
4949

50-
void draw_chany_to_chany_edge(RRNodeId from_node, RRNodeId to_node, int to_track, short switch_type, ezgl::renderer* g);
51-
void draw_chanx_to_chanx_edge(RRNodeId from_node, RRNodeId to_node, int to_track, short switch_type, ezgl::renderer* g);
52-
void draw_chanx_to_chany_edge(int chanx_node, int chanx_track, int chany_node, int chany_track, enum e_edge_dir edge_dir, short switch_type, ezgl::renderer* g);
50+
void draw_chany_to_chany_edge(RRNodeId from_node, RRNodeId to_node, short switch_type, ezgl::renderer* g);
51+
void draw_chanx_to_chanx_edge(RRNodeId from_node, RRNodeId to_node, short switch_type, ezgl::renderer* g);
52+
void draw_chanx_to_chany_edge(int chanx_node, int chany_node, enum e_edge_dir edge_dir, short switch_type, ezgl::renderer* g);
5353
void draw_pin_to_pin(int opin, int ipin, ezgl::renderer* g);
5454
void draw_pin_to_sink(int ipin_node, int sink_node, ezgl::renderer* g);
5555
void draw_source_to_pin(int source_node, int opin_node, ezgl::renderer* g);

0 commit comments

Comments
 (0)