[vlc-commits] d3d11: rename View matrix into Zoom

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Fri Mar  8 10:35:43 2019 +0100| [a99d158fc46e7abb2f56f37da93d0afb4d1d731e] | committer: Steve Lhomme

d3d11: rename View matrix into Zoom

View matrix usually designates the camera transformation.

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a99d158fc46e7abb2f56f37da93d0afb4d1d731e
---

 modules/video_output/win32/d3d11_shaders.c | 4 ++--
 modules/video_output/win32/d3d11_shaders.h | 2 +-
 modules/video_output/win32/direct3d11.c    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/win32/d3d11_shaders.c b/modules/video_output/win32/d3d11_shaders.c
index c10b2f1ee2..fb621d2d39 100644
--- a/modules/video_output/win32/d3d11_shaders.c
+++ b/modules/video_output/win32/d3d11_shaders.c
@@ -169,7 +169,7 @@ cbuffer VS_PROJECTION_CONST : register(b0)\n\
    float4x4 RotX;\n\
    float4x4 RotY;\n\
    float4x4 RotZ;\n\
-   float4x4 View;\n\
+   float4x4 Zoom;\n\
    float4x4 Projection;\n\
 };\n\
 struct VS_INPUT\n\
@@ -191,7 +191,7 @@ VS_OUTPUT main( VS_INPUT In )\n\
   pos = mul(RotY, pos);\n\
   pos = mul(RotX, pos);\n\
   pos = mul(RotZ, pos);\n\
-  pos = mul(View, pos);\n\
+  pos = mul(Zoom, pos);\n\
   pos = mul(Projection, pos);\n\
   Output.Position = pos;\n\
   Output.Texture = In.Texture;\n\
diff --git a/modules/video_output/win32/d3d11_shaders.h b/modules/video_output/win32/d3d11_shaders.h
index 1d49fd185a..3a84b99746 100644
--- a/modules/video_output/win32/d3d11_shaders.h
+++ b/modules/video_output/win32/d3d11_shaders.h
@@ -69,7 +69,7 @@ typedef struct {
     FLOAT RotX[4*4];
     FLOAT RotY[4*4];
     FLOAT RotZ[4*4];
-    FLOAT View[4*4];
+    FLOAT Zoom[4*4];
     FLOAT Projection[4*4];
 } VS_PROJECTION_CONST;
 
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 544f68efd4..c84e4e85d6 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -801,7 +801,7 @@ static void SetQuadVSProjection(vout_display_t *vd, d3d_quad_t *quad, const vlc_
         getXRotMatrix(f_phi, dst_data->RotX);
         getYRotMatrix(f_teta,   dst_data->RotY);
         getZRotMatrix(f_roll,  dst_data->RotZ);
-        getZoomMatrix(SPHERE_RADIUS * f_z, dst_data->View);
+        getZoomMatrix(SPHERE_RADIUS * f_z, dst_data->Zoom);
         getProjectionMatrix(f_sar, f_fovy, dst_data->Projection);
     }
     ID3D11DeviceContext_Unmap(sys->d3d_dev.d3dcontext, (ID3D11Resource *)quad->pVertexShaderConstants, 0);