Metal: GLSL Compatibility - explicit mat4_to_mat3 conversion

Explicit constructor for mat3 from a mat4 is not valid and cannot be overloaded.

Adding explicit texture resource type flags for depth textures. This is an explicit requirement for Metal Shading language. This is a temporary compatibility, as this path is already supported in GPU_SHADER_CREATE_INFO under ImageType::DEPTH_2D, though required in shader source for MSL shaders which do not have create info.

Authored by Apple: Michael Parkin-White

Ref T96261

Reviewed By: fclem

Maniphest Tasks: T96261

Differential Revision: https://developer.blender.org/D14418

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/draw/engines/overlay/shaders/grid_frag.glsl b/source/blender/draw/engines/overlay/shaders/grid_frag.glsl
index 9feca644bd3..4a9b8d15528 100644
--- a/source/blender/draw/engines/overlay/shaders/grid_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/grid_frag.glsl
@@ -12,7 +12,7 @@ uniform vec3 planeAxes;
 uniform float gridDistance;
 uniform vec3 gridSize;
 uniform float lineKernel = 0.0;
-uniform sampler2D depthBuffer;
+uniform depth2D depthBuffer;
 
 uniform int gridFlag;
 uniform float zoomFactor;
@@ -49,7 +49,7 @@ float get_grid(vec2 co, vec2 fwidthCos, float grid_size)
 {
   float half_size = grid_size / 2.0;
   /* triangular wave pattern, amplitude is [0, half_size] */
-  vec2 grid_domain = abs(mod(co + half_size, grid_size) - half_size);
+  vec2 grid_domain = abs(mod(co + half_size, vec2(grid_size)) - half_size);
   /* modulate by the absolute rate of change of the coordinates
    * (make lines have the same width under perspective) */
   grid_domain /= fwidthCos;