From e061e7028b3b92cbf77d51b4e716de36cc7aa6a7 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Mon, 16 May 2022 07:46:21 +0200
Subject: [PATCH] Revert "(D3D) Start cutting down on d3d_matrix_identity"

This reverts commit d6e6fb2a93cc5f4aa09833a122a2d1a41dd08373.
---
 gfx/drivers/d3d8.c   | 9 +++------
 gfx/drivers/d3d9cg.c | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c
index e3036fd0dc..7d29534c51 100644
--- a/gfx/drivers/d3d8.c
+++ b/gfx/drivers/d3d8.c
@@ -98,14 +98,11 @@ struct d3d8_texture_info
 
 void d3d8_set_mvp(void *data, const void *mat_data)
 {
-   struct d3d_matrix matrix   = {
-      1.0f, 0.0f, 0.0f, 0.0f,
-      0.0f, 1.0f, 0.0f, 0.0f,
-      0.0f, 0.0f, 1.0f, 0.0f,
-      0.0f, 0.0f, 0.0f, 1.0f
-   };
+   struct d3d_matrix matrix;
    LPDIRECT3DDEVICE8 d3dr     = (LPDIRECT3DDEVICE8)data;
 
+   d3d_matrix_identity(&matrix);
+
    IDirect3DDevice8_SetTransform(d3dr,
          D3DTS_PROJECTION, (D3DMATRIX*)&matrix);
    IDirect3DDevice8_SetTransform(d3dr,
diff --git a/gfx/drivers/d3d9cg.c b/gfx/drivers/d3d9cg.c
index 6d69c95fd4..c633ce3cdc 100644
--- a/gfx/drivers/d3d9cg.c
+++ b/gfx/drivers/d3d9cg.c
@@ -783,15 +783,12 @@ static bool d3d9_cg_renderchain_create_first_pass(
 {
    unsigned i;
    struct shader_pass pass;
-   struct d3d_matrix ident   = {
-      1.0f, 0.0f, 0.0f, 0.0f,
-      0.0f, 1.0f, 0.0f, 0.0f,
-      0.0f, 0.0f, 1.0f, 0.0f,
-      0.0f, 0.0f, 0.0f, 1.0f
-   };
+   struct d3d_matrix ident;
    unsigned fmt = (_fmt == RETRO_PIXEL_FORMAT_RGB565) ?
       D3D9_RGB565_FORMAT : D3D9_XRGB8888_FORMAT;
 
+   d3d_matrix_identity(&ident);
+
    IDirect3DDevice9_SetTransform(dev, D3DTS_WORLD, (D3DMATRIX*)&ident);
    IDirect3DDevice9_SetTransform(dev, D3DTS_VIEW,  (D3DMATRIX*)&ident);