pass pixel format to vgerNew

audulus · Jun 3, 2024 · 1c843d9 · 1c843d9
1 parent 6c8fbab
commit 1c843d9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/Sources/vger/include/vger.h b/Sources/vger/include/vger.h
@@ -63,8 +63,10 @@ enum vgerCreateFlags {
     VGER_TRIPLE_BUFFER = 1 << 1,
 };
 
+#ifdef __OBJC__
 /// Create a new state object.
-vgerContext vgerNew(uint32_t flags);
+vgerContext vgerNew(uint32_t flags, MTLPixelFormat pixelFormat);
+#endif
 
 /// Deallocate state object.
 void vgerDelete(vgerContext);

diff --git a/Sources/vger/vger.mm b/Sources/vger/vger.mm
@@ -20,9 +20,9 @@
 #import "bezier.h"
 #import "vger_private.h"
 
-vger::vger(uint32_t flags) {
+vger::vger(uint32_t flags, MTLPixelFormat pixelFormat) {
     device = MTLCreateSystemDefaultDevice();
-    renderer = [[vgerRenderer alloc] initWithDevice:device pixelFormat:MTLPixelFormatBGRA8Unorm];
+    renderer = [[vgerRenderer alloc] initWithDevice:device pixelFormat:pixelFormat];
     glowRenderer = [[vgerRenderer alloc] initWithDevice:device pixelFormat:MTLPixelFormatRGBA16Unorm];
     glyphCache = [[vgerGlyphCache alloc] initWithDevice:device];
 
@@ -64,8 +64,8 @@
     textureLoader = [[MTKTextureLoader alloc] initWithDevice:device];
 }
 
-vgerContext vgerNew(uint32_t flags) {
-    return new vger(flags);
+vgerContext vgerNew(uint32_t flags, MTLPixelFormat pixelFormat) {
+    return new vger(flags, pixelFormat);
 }
 
 void vgerDelete(vgerContext vg) {

diff --git a/Sources/vger/vger_private.h b/Sources/vger/vger_private.h
@@ -123,7 +123,7 @@ struct vger {
     /// Have we already computed glyph bounds?
     bool computedGlyphBounds = false;
 
-    vger(uint32_t flags);
+    vger(uint32_t flags, MTLPixelFormat pixelFormat);
 
     void addPrim(const vgerPrim& prim) {
         scenes[currentScene].prims[currentLayer].append(prim);

diff --git a/Sources/vgerSwift/Renderer.swift b/Sources/vgerSwift/Renderer.swift
@@ -6,7 +6,7 @@ import vger
 
 class Renderer: NSObject, MTKViewDelegate {
 
-    var vg = vgerNew(0)
+    var vg = vgerNew(0, .bgra8Unorm)
     var device: MTLDevice!
     var queue: MTLCommandQueue!
     var renderCallback : ((vgerContext, CGSize) -> Void)?

diff --git a/Tests/vgerTests/vgerTests.mm b/Tests/vgerTests/vgerTests.mm
@@ -126,7 +126,7 @@ - (void) testBasic {
     float theta = 0;
     float ap = .5 * M_PI;
 
-    auto vg = vgerNew(0);
+    auto vg = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vg, 512, 512, 1.0);
 
@@ -161,7 +161,7 @@ - (void) testBasic {
 
 - (void) testTransformStack {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 512, 512, 1.0);
 
@@ -185,7 +185,7 @@ - (void) testTransformStack {
 
 - (void) testRotate {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 512, 512, 1.0);
 
@@ -207,7 +207,7 @@ - (void) testRotate {
 
 - (void) testRects {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
     assert(vger);
 
     vgerBegin(vger, 512, 512, 1.0);
@@ -245,7 +245,7 @@ - (NSURL*) getImageURL:(NSString*)name {
 
 - (void) testRenderTexture {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 512, 512, 1.0);
 
@@ -264,7 +264,7 @@ - (void) testRenderTexture {
 
 - (void) testText {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 512, 512, 1.0);
 
@@ -281,7 +281,7 @@ - (void) testText {
 
 - (void) testScaleText {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 512, 512, 1.0);
 
@@ -316,7 +316,7 @@ - (void) testBezierPerf {
 
     int N = 10000;
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     [self measureBlock:^{
 
@@ -352,7 +352,7 @@ - (void) testBezierPerf {
 
 - (void) testBezierPerfSplit {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     [self measureBlock:^{
 
@@ -484,7 +484,7 @@ - (void) testPrimDemo {
     auto cyan = float4{0,1,1,1};
     auto magenta = float4{1,0,1,1};
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 800, 800, 1.0);
 
@@ -618,7 +618,7 @@ - (void) testPaint {
 
 - (void) testTextAlgin {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 512, 512, 1.0);
 
@@ -652,7 +652,7 @@ - (void) testPathFill {
     int w = 512, h = 512;
     float2 sz = {float(w),float(h)};
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, w, h, 1.0);
 
@@ -676,7 +676,7 @@ - (void) testEmptyPathFill {
     int w = 512, h = 512;
     float2 sz = {float(w),float(h)};
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, w, h, 1.0);
 
@@ -708,7 +708,7 @@ - (void) testPathFillCircle {
     int w = 512, h = 512;
     float2 sz = {float(w),float(h)};
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, w, h, 1.0);
 
@@ -728,7 +728,7 @@ - (void) testPathFillCircle {
 
 - (void) testTextBox {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 512, 512, 1.0);
 
@@ -762,7 +762,7 @@ - (void) testTiger {
 
     printf("size: %f x %f\n", image->width, image->height);
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     vgerBegin(vger, 512, 512, 1.0);
 
@@ -809,7 +809,7 @@ - (void) testTigerPerf {
 
     printf("size: %f x %f\n", image->width, image->height);
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     [self measureBlock:^{
 
@@ -878,7 +878,7 @@ - (void) testTextLayoutKey {
 
 - (void) testLayers {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
     vgerSetLayerCount(vger, 2);
 
     vgerBegin(vger, 512, 512, 1.0);
@@ -902,7 +902,7 @@ - (void) testLayers {
 
 - (void) testPathRectangle {
 
-    auto vger = vgerNew(0);
+    auto vger = vgerNew(0, MTLPixelFormatBGRA8Unorm);
 
     auto w = 0.5f;
     auto h = 50.0f;