From 5f5305d61d66452850d8fec0693cff6e129acb94 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 15 Feb 2012 09:04:22 +0900
Subject: [PATCH] Map vr_data/funcs to vid_render_data/funcs.

---
 include/r_internal.h                  | 6 ++++--
 libs/video/renderer/vid_render_gl.c   | 4 ++--
 libs/video/renderer/vid_render_glsl.c | 4 ++--
 libs/video/renderer/vid_render_sw.c   | 4 ++--
 libs/video/renderer/vid_render_sw32.c | 4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/include/r_internal.h b/include/r_internal.h
index a4a8adb1a..6a44dbd86 100644
--- a/include/r_internal.h
+++ b/include/r_internal.h
@@ -11,8 +11,10 @@
 
 extern viddef_t 		vid;				// global video state
 
-extern vid_render_data_t vr_data;
-extern vid_render_funcs_t vr_funcs;
+extern vid_render_data_t vid_render_data;
+extern vid_render_funcs_t vid_render_funcs;
+#define vr_data vid_render_data
+#define vr_funcs vid_render_funcs
 
 extern	refdef_t	r_refdef;
 extern int r_viewsize;
diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index cc6a0d5e4..ffc3de86e 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -55,7 +55,7 @@ static vid_model_funcs_t model_funcs = {
 	Skin_SetPlayerSkin,
 };
 
-static vid_render_funcs_t vid_render_funcs = {
+vid_render_funcs_t vid_render_funcs = {
 	Draw_Init,
 	Draw_Character,
 	Draw_String,
@@ -107,7 +107,7 @@ static vid_render_funcs_t vid_render_funcs = {
 	&model_funcs
 };
 
-static vid_render_data_t vid_render_data = {
+vid_render_data_t vid_render_data = {
 	&vid, &r_refdef, &scr_vrect,
 	0, 0, 0,
 	0,
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index 7b61aba6e..0323485cc 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -55,7 +55,7 @@ static vid_model_funcs_t model_funcs = {
 	Skin_SetPlayerSkin,
 };
 
-static vid_render_funcs_t vid_render_funcs = {
+vid_render_funcs_t vid_render_funcs = {
 	Draw_Init,
 	Draw_Character,
 	Draw_String,
@@ -107,7 +107,7 @@ static vid_render_funcs_t vid_render_funcs = {
 	&model_funcs
 };
 
-static vid_render_data_t vid_render_data = {
+vid_render_data_t vid_render_data = {
 	&vid, &r_refdef, &scr_vrect,
 	0, 0, 0,
 	0,
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index 391b8eb6a..228137862 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -55,7 +55,7 @@ static vid_model_funcs_t model_funcs = {
 	Skin_SetPlayerSkin,
 };
 
-static vid_render_funcs_t vid_render_funcs = {
+vid_render_funcs_t vid_render_funcs = {
 	Draw_Init,
 	Draw_Character,
 	Draw_String,
@@ -107,7 +107,7 @@ static vid_render_funcs_t vid_render_funcs = {
 	&model_funcs
 };
 
-static vid_render_data_t vid_render_data = {
+vid_render_data_t vid_render_data = {
 	&vid, &r_refdef, &scr_vrect,
 	0, 0, 0,
 	0,
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index 9caca71d1..c1e5e1abd 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -55,7 +55,7 @@ static vid_model_funcs_t model_funcs = {
 	Skin_SetPlayerSkin,
 };
 
-static vid_render_funcs_t vid_render_funcs = {
+vid_render_funcs_t vid_render_funcs = {
 	Draw_Init,
 	Draw_Character,
 	Draw_String,
@@ -107,7 +107,7 @@ static vid_render_funcs_t vid_render_funcs = {
 	&model_funcs
 };
 
-static vid_render_data_t vid_render_data = {
+vid_render_data_t vid_render_data = {
 	&vid, &r_refdef, &scr_vrect,
 	0, 0, 0,
 	0,