From eebcde721b75102fde2b621bcb3c4238d0e2d14b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Mar 2016 07:27:48 +0100
Subject: [PATCH] Rename video_coord_array

---
 Makefile.common                             |  2 +-
 gfx/common/gl_common.h                      |  2 +-
 gfx/d3d/d3d.cpp                             |  2 +-
 gfx/drivers/vulkan.c                        |  2 +-
 gfx/{video_common.c => video_coord_array.c} | 16 +++++++++-------
 gfx/{video_common.h => video_coord_array.h} |  4 ++--
 griffin/griffin.c                           |  2 +-
 menu/menu_display.h                         |  2 +-
 8 files changed, 17 insertions(+), 15 deletions(-)
 rename gfx/{video_common.c => video_coord_array.c} (97%)
 rename gfx/{video_common.h => video_coord_array.h} (97%)

diff --git a/Makefile.common b/Makefile.common
index 59a27466cb..f48485d6a6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -146,7 +146,7 @@ OBJ += frontend/frontend.o \
        audio/audio_driver.o \
        input/input_driver.o \
        input/input_hid_driver.o \
-       gfx/video_common.o \
+       gfx/video_coord_array.o \
        gfx/video_driver.o \
        camera/camera_driver.o \
        location/location_driver.o \
diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h
index 1282a09d1e..ad51d84b3b 100644
--- a/gfx/common/gl_common.h
+++ b/gfx/common/gl_common.h
@@ -33,7 +33,7 @@
 #include "../../general.h"
 #include "../../verbosity.h"
 #include "../font_driver.h"
-#include "../video_common.h"
+#include "../video_coord_array.h"
 #include "../video_context_driver.h"
 
 #if (!defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES3))
diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 0f320a71aa..439a710a5b 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -27,7 +27,7 @@
 #include <string/stdstring.h>
 
 #include "d3d.h"
-#include "../video_common.h"
+#include "../video_coord_array.h"
 #include "../../dynamic.h"
 #include "render_chain_driver.h"
 
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 1c5d6f6df7..365e919cb8 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -48,7 +48,7 @@
 
 #include "../font_driver.h"
 #include "../video_context_driver.h"
-#include "../video_common.h"
+#include "../video_coord_array.h"
 
 static void vulkan_set_viewport(void *data, unsigned viewport_width,
       unsigned viewport_height, bool force_full, bool allow_rotate);
diff --git a/gfx/video_common.c b/gfx/video_coord_array.c
similarity index 97%
rename from gfx/video_common.c
rename to gfx/video_coord_array.c
index 23059d7c7e..bfccd11c0b 100644
--- a/gfx/video_common.c
+++ b/gfx/video_coord_array.c
@@ -19,7 +19,7 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 
-#include "video_common.h"
+#include "video_coord_array.h"
 
 static INLINE bool realloc_checked(void **ptr, size_t size)
 {
@@ -99,18 +99,20 @@ void gfx_coord_array_free(gfx_coord_array_t *ca)
 
    if (ca->coords.vertex)
       free(ca->coords.vertex);
+   ca->coords.vertex        = NULL;
+
    if (ca->coords.color)
       free(ca->coords.color);
+   ca->coords.color         = NULL;
+
    if (ca->coords.tex_coord)
       free(ca->coords.tex_coord);
+   ca->coords.tex_coord     = NULL;
+
    if (ca->coords.lut_tex_coord)
       free(ca->coords.lut_tex_coord);
-
-   ca->coords.vertex        = NULL;
-   ca->coords.color         = NULL;
-   ca->coords.tex_coord     = NULL;
    ca->coords.lut_tex_coord = NULL;
 
-   ca->coords.vertices = 0;
-   ca->allocated       = 0;
+   ca->coords.vertices      = 0;
+   ca->allocated            = 0;
 }
diff --git a/gfx/video_common.h b/gfx/video_coord_array.h
similarity index 97%
rename from gfx/video_common.h
rename to gfx/video_coord_array.h
index e1ba8adfd0..77b3ad19bb 100644
--- a/gfx/video_common.h
+++ b/gfx/video_coord_array.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIDEO_COMMON_H
-#define __VIDEO_COMMON_H
+#ifndef __VIDEO_COORD_ARRAY_H
+#define __VIDEO_COORD_ARRAY_H
 
 #include <stdint.h>
 #include <string.h>
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d66428026c..51f97a7e7e 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -565,7 +565,7 @@ AUDIO
 DRIVERS
 ============================================================ */
 #include "../gfx/video_driver.c"
-#include "../gfx/video_common.c"
+#include "../gfx/video_coord_array.c"
 #include "../input/input_driver.c"
 #include "../audio/audio_driver.c"
 #include "../camera/camera_driver.c"
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 846abb1a55..87f384dd7e 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -24,7 +24,7 @@
 
 #include "../gfx/video_context_driver.h"
 #include "../gfx/font_driver.h"
-#include "../gfx/video_common.h"
+#include "../gfx/video_coord_array.h"
 #include "../libretro_version_1.h"
 
 #ifdef __cplusplus