in the Metal samples, SG_PIXELFORMAT_NONE/DEPTH/DEPTH_STENCIL as dept…

…h buffer formats
floooh · Mar 1, 2024 · 023a08f · 023a08f
1 parent 869367e
commit 023a08f
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 23 deletions.
diff --git a/metal/arraytex-metal.c b/metal/arraytex-metal.c
@@ -233,6 +233,6 @@ static void shutdown() {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Array Texture (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "arraytex-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/binshader-metal.c b/metal/binshader-metal.c
@@ -143,6 +143,6 @@ static void shutdown() {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Shader Bytecode (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "binshader-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/blend-metal.c b/metal/blend-metal.c
@@ -219,5 +219,5 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Blend (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH_STENCIL, "blend-metal", init, frame, shutdown);
 }
diff --git a/metal/bufferoffsets-metal.c b/metal/bufferoffsets-metal.c
@@ -115,6 +115,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(640, 480, 1, "Sokol Buffer Offsets (Metal)", init, frame, shutdown);
+    osx_start(640, 480, 1, SG_PIXELFORMAT_NONE, "bufferoffsets-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/clear-metal.c b/metal/clear-metal.c
@@ -36,6 +36,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(640, 480, 1, "Sokol Clear (Metal)", init, frame, shutdown);
+    osx_start(640, 480, 1, SG_PIXELFORMAT_NONE, "clear-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/cube-metal.c b/metal/cube-metal.c
@@ -160,6 +160,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Cube (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "cube-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/dyntex-metal.c b/metal/dyntex-metal.c
@@ -204,7 +204,7 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(DISPLAY_WIDTH, DISPLAY_HEIGHT, SAMPLE_COUNT, "Dynamic Texture (Metal)", init, frame, shutdown);
+    osx_start(DISPLAY_WIDTH, DISPLAY_HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "dyntex-metal", init, frame, shutdown);
     return 0;
 }
 

diff --git a/metal/imgui-metal.cc b/metal/imgui-metal.cc
@@ -117,6 +117,6 @@ void shutdown() {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, 1, "Sokol Dear ImGui (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, 1, SG_PIXELFORMAT_NONE, "Sokol Dear ImGui (Metal)", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/inject-metal.m b/metal/inject-metal.m
@@ -269,6 +269,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Resource Injection (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH_STENCIL, "inject-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/instancing-metal.c b/metal/instancing-metal.c
@@ -193,6 +193,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Instancing (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "instancing-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/mipmap-metal.c b/metal/mipmap-metal.c
@@ -234,5 +234,5 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Mipmapping (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "mipmap-metal", init, frame, shutdown);
 }
diff --git a/metal/mrt-metal.c b/metal/mrt-metal.c
@@ -409,6 +409,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol MRT (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "mrt-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/noninterleaved-metal.c b/metal/noninterleaved-metal.c
@@ -169,6 +169,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Non-Interleaved Vertex Data (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "noninterleaved-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/offscreen-metal.c b/metal/offscreen-metal.c
@@ -315,6 +315,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol Offscreen (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH_STENCIL, "offscreen-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/osxentry.h b/metal/osxentry.h
@@ -23,7 +23,7 @@ typedef void(*osx_mouse_pos_func)(float x, float y);
 typedef void(*osx_mouse_wheel_func)(float v);
 
 /* entry function */
-extern void osx_start(int w, int h, int sample_count, const char* title, osx_init_func, osx_frame_func, osx_shutdown_func);
+extern void osx_start(int w, int h, int sample_count, sg_pixel_format depth_format, const char* title, osx_init_func, osx_frame_func, osx_shutdown_func);
 /* return an initialized sg_environment struct */
 sg_environment osx_environment(void);
 /* return an initialized sg_swapchain struct */

diff --git a/metal/osxentry.m b/metal/osxentry.m
@@ -31,6 +31,7 @@ @interface SokolMTKView : MTKView
 static int width;
 static int height;
 static int sample_count;
+static sg_pixel_format depth_format;
 static const char* window_title;
 static osx_init_func init_func;
 static osx_frame_func frame_func;
@@ -109,7 +110,17 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
     [mtk_view setDelegate:mtk_view_delegate];
     [mtk_view setDevice: mtl_device];
     [mtk_view setColorPixelFormat:MTLPixelFormatBGRA8Unorm];
-    [mtk_view setDepthStencilPixelFormat:MTLPixelFormatDepth32Float_Stencil8];
+    switch (depth_format) {
+        case SG_PIXELFORMAT_DEPTH_STENCIL:
+            [mtk_view setDepthStencilPixelFormat:MTLPixelFormatDepth32Float_Stencil8];
+            break;
+        case SG_PIXELFORMAT_DEPTH:
+            [mtk_view setDepthStencilPixelFormat:MTLPixelFormatDepth32Float];
+            break;
+        default:
+            [mtk_view setDepthStencilPixelFormat:MTLPixelFormatInvalid];
+            break;
+    }
     [mtk_view setSampleCount:(NSUInteger)sample_count];
     #if !TARGET_OS_IPHONE
         [window setContentView:mtk_view];
@@ -305,10 +316,12 @@ - (void)scrollWheel:(NSEvent*)event {
 @end
 
 //------------------------------------------------------------------------------
-void osx_start(int w, int h, int smp_count, const char* title, osx_init_func ifun, osx_frame_func ffun, osx_shutdown_func sfun) {
+void osx_start(int w, int h, int smp_count, sg_pixel_format depth_fmt, const char* title, osx_init_func ifun, osx_frame_func ffun, osx_shutdown_func sfun) {
+    assert((depth_fmt == SG_PIXELFORMAT_DEPTH_STENCIL) || (depth_fmt == SG_PIXELFORMAT_DEPTH) || (depth_fmt == SG_PIXELFORMAT_NONE));
     width = w;
     height = h;
     sample_count = smp_count;
+    depth_format = depth_fmt;
     window_title = title;
     init_func = ifun;
     frame_func = ffun;
@@ -340,7 +353,7 @@ sg_environment osx_environment(void) {
         .defaults = {
             .sample_count = sample_count,
             .color_format = SG_PIXELFORMAT_BGRA8,
-            .depth_format = SG_PIXELFORMAT_DEPTH_STENCIL,
+            .depth_format = depth_format,
         },
         .metal = {
             .device = (__bridge const void*) mtl_device,
@@ -354,7 +367,7 @@ sg_swapchain osx_swapchain(void) {
         .height = (int) [mtk_view drawableSize].height,
         .sample_count = sample_count,
         .color_format = SG_PIXELFORMAT_BGRA8,
-        .depth_format = SG_PIXELFORMAT_DEPTH_STENCIL,
+        .depth_format = depth_format,
         .metal = {
             .current_drawable = (__bridge const void*) [mtk_view currentDrawable],
             .depth_stencil_texture = (__bridge const void*) [mtk_view depthStencilTexture],

diff --git a/metal/quad-metal.c b/metal/quad-metal.c
@@ -96,6 +96,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(640, 480, 1, "Sokol Quad (Metal)", init, frame, shutdown);
+    osx_start(640, 480, 1, SG_PIXELFORMAT_NONE, "quad-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/releasetest-metal.c b/metal/releasetest-metal.c
@@ -105,6 +105,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(640, 480, 1, "Sokol Resource Stress (Metal)", init, frame, shutdown);
+    osx_start(640, 480, 1, SG_PIXELFORMAT_DEPTH_STENCIL, "releasetest-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/texcube-metal.c b/metal/texcube-metal.c
@@ -198,6 +198,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, "Sokol TexCube (Metal)", init, frame, shutdown);
+    osx_start(WIDTH, HEIGHT, SAMPLE_COUNT, SG_PIXELFORMAT_DEPTH, "texcube-metal", init, frame, shutdown);
     return 0;
 }
diff --git a/metal/triangle-metal.c b/metal/triangle-metal.c
@@ -92,6 +92,6 @@ static void shutdown(void) {
 }
 
 int main() {
-    osx_start(640, 480, 1, "Sokol Triangle (Metal)", init, frame, shutdown);
+    osx_start(640, 480, 1, SG_PIXELFORMAT_NONE, "triangle-metal", init, frame, shutdown);
     return 0;
 }