From ea5e4e9ae445ad11fde47b721ef05f38db86d53f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 17 May 2018 17:10:44 +0200
Subject: [PATCH] Create struct D3D9Vertex

---
 gfx/drivers_renderchain/d3d9_cg_renderchain.c | 22 ++++++-------------
 .../d3d9_hlsl_renderchain.c                   | 16 ++++----------
 gfx/drivers_renderchain/d3d9_renderchain.h    |  8 +++++++
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
index ca7043af66..a13702b49a 100644
--- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
@@ -56,14 +56,6 @@ static void set_cg_param(void *data, const char *name, const void *values)
       cgD3D9SetUniform(cgp, values);
 }
 
-struct CGVertex
-{
-   float x, y, z;
-   float u, v;
-   float lut_u, lut_v;
-   float r, g, b, a;
-};
-
 #include "d3d9_renderchain.h"
 
 typedef struct cg_renderchain
@@ -430,7 +422,7 @@ static void d3d9_cg_renderchain_bind_orig(
       unsigned index = attrib_map->data[cgGetParameterResourceIndex(param)];
 
       d3d9_set_stream_source(chain->chain.dev, index,
-            vert_buf, 0, sizeof(struct CGVertex));
+            vert_buf, 0, sizeof(struct D3D9Vertex));
       unsigned_vector_list_append(chain->chain.bound_vert, index);
    }
 }
@@ -508,7 +500,7 @@ static void d3d9_cg_renderchain_bind_prev(cg_renderchain_t *chain,
          unsigned index = attrib_map->data[cgGetParameterResourceIndex(param)];
 
          d3d9_set_stream_source(chain->chain.dev, index,
-               vert_buf, 0, sizeof(struct CGVertex));
+               vert_buf, 0, sizeof(struct D3D9Vertex));
          unsigned_vector_list_append(chain->chain.bound_vert, index);
       }
    }
@@ -585,7 +577,7 @@ static void d3d9_cg_renderchain_bind_pass(
          unsigned index = attrib_map->data[cgGetParameterResourceIndex(param)];
 
          d3d9_set_stream_source(chain->chain.dev, index, curr_pass->vertex_buf,
-               0, sizeof(struct CGVertex));
+               0, sizeof(struct D3D9Vertex));
          unsigned_vector_list_append(chain->chain.bound_vert, index);
       }
    }
@@ -759,7 +751,7 @@ static bool d3d9_cg_renderchain_create_first_pass(
       chain->chain.prev.last_height[i] = 0;
       chain->chain.prev.vertex_buf[i]  = (LPDIRECT3DVERTEXBUFFER9)
          d3d9_vertex_buffer_new(
-            chain->chain.dev, 4 * sizeof(struct CGVertex),
+            chain->chain.dev, 4 * sizeof(struct D3D9Vertex),
             D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, NULL);
 
       if (!chain->chain.prev.vertex_buf[i])
@@ -952,7 +944,7 @@ static bool d3d9_cg_renderchain_add_pass(
 
    pass.vertex_buf = (LPDIRECT3DVERTEXBUFFER9)
       d3d9_vertex_buffer_new(chain->chain.dev,
-         4 * sizeof(struct CGVertex),
+         4 * sizeof(struct D3D9Vertex),
          D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, NULL);
 
    if (!pass.vertex_buf)
@@ -1075,7 +1067,7 @@ static void cg_d3d9_renderchain_set_vertices(
 
    if (pass->last_width != width || pass->last_height != height)
    {
-      struct CGVertex vert[4];
+      struct D3D9Vertex vert[4];
       unsigned i;
       void *verts       = NULL;
       float _u          = (float)(width)  / info->tex_w;
@@ -1238,7 +1230,7 @@ static void cg_d3d9_renderchain_render_pass(
    for (i = 0; i < 4; i++)
       d3d9_set_stream_source(chain->chain.dev, i,
             pass->vertex_buf, 0,
-            sizeof(struct CGVertex));
+            sizeof(struct D3D9Vertex));
 
    /* Set orig texture. */
    d3d9_cg_renderchain_bind_orig(chain, pass);
diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
index 2c338cb267..7798c69105 100644
--- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
@@ -72,14 +72,6 @@ typedef struct hlsl_shader_data
    struct video_shader *cg_shader;
 } hlsl_shader_data_t;
 
-struct HLSLVertex
-{
-   float x, y, z;
-   float u, v;
-   float lut_u, lut_v;
-   float r, g, b, a;
-};
-
 #include "d3d9_renderchain.h"
 
 typedef struct hlsl_d3d9_renderchain
@@ -536,7 +528,7 @@ static bool hlsl_d3d9_renderchain_create_first_pass(
       chain->chain.prev.last_height[i] = 0;
       chain->chain.prev.vertex_buf[i]  = (LPDIRECT3DVERTEXBUFFER9)
          d3d9_vertex_buffer_new(
-            chain->chain.dev, 4 * sizeof(struct HLSLVertex),
+            chain->chain.dev, 4 * sizeof(struct D3D9Vertex),
             D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, NULL);
 
       if (!chain->chain.prev.vertex_buf[i])
@@ -561,7 +553,7 @@ static bool hlsl_d3d9_renderchain_create_first_pass(
    }
 
    pass.vertex_buf        = d3d9_vertex_buffer_new(
-         dev, 4 * sizeof(struct HLSLVertex),
+         dev, 4 * sizeof(struct D3D9Vertex),
          D3DUSAGE_WRITEONLY,
          0,
          D3DPOOL_MANAGED,
@@ -627,7 +619,7 @@ static void hlsl_d3d9_renderchain_set_vertices(
    if (pass->last_width != width || pass->last_height != height)
    {
       unsigned i;
-      struct HLSLVertex vert[4];
+      struct D3D9Vertex vert[4];
       void *verts        = NULL;
       float _u           = (width)  / pass->info.tex_w;
       float _v           = (height) / pass->info.tex_h;
@@ -1021,7 +1013,7 @@ static void hlsl_d3d9_renderchain_render_pass(
    for (i = 0; i < 4; i++)
       d3d9_set_stream_source(chain->chain.dev, i,
             pass->vertex_buf, 0,
-            sizeof(struct HLSLVertex));
+            sizeof(struct D3D9Vertex));
 
 #if 0
    /* Set orig texture. */
diff --git a/gfx/drivers_renderchain/d3d9_renderchain.h b/gfx/drivers_renderchain/d3d9_renderchain.h
index 348f3379e7..32ef649fc2 100644
--- a/gfx/drivers_renderchain/d3d9_renderchain.h
+++ b/gfx/drivers_renderchain/d3d9_renderchain.h
@@ -67,6 +67,14 @@ struct shader_pass
 #undef VECTOR_LIST_TYPE
 #undef VECTOR_LIST_NAME
 
+struct D3D9Vertex
+{
+   float x, y, z;
+   float u, v;
+   float lut_u, lut_v;
+   float r, g, b, a;
+};
+
 typedef struct d3d9_renderchain
 {
    unsigned pixel_size;