windows update to v0.19.1.1

Author: arhik

src/glfwWindows.jl

@@ -122,7 +122,7 @@ function WGPUCore.getContext(gpuCanvas::GLFWWinCanvas)
             gpuCanvas.device,            # device::Any
             WGPUTextureFormat_R8Unorm,   # format::WGPUTextureFormat
             WGPUCore.getEnum(WGPUTextureUsage, ["RenderAttachment", "CopySrc"]),         # usage::WGPUTextureUsage
-            WGPUCompositeAlphaMode_PreMultiplied,                     # compositingAlphaMode::Any
+            WGPUCompositeAlphaMode_Premultiplied,                     # compositingAlphaMode::Any
             nothing,                     # size::Any
             gpuCanvas.size,              # physicalSize::Any
             nothing,                     # pixelRatio::Any
@@ -190,25 +190,30 @@ function WGPUCore.getCurrentTexture(cntxt::GPUCanvasContext)
     # if cntxt.device.internal[] == C_NULL
         # @error "context must be configured before request for texture"
     # end
+    canvas = cntxt.canvasRef[]
+    surface = canvas.surfaceRef[]
+    surfaceTexture = cStruct(WGPUSurfaceTexture;)
     if cntxt.currentTexture == nothing
-        createNativeSwapChainMaybe(cntxt)
-        id = wgpuSwapChainGetCurrentTextureView(cntxt.internal[]) |> Ref
+        configureSurface(cntxt)
+        wgpuSurfaceGetCurrentTexture(surface, surfaceTexture|>ptr)
         size = (cntxt.surfaceSize..., 1)
+        currentTexture = wgpuTextureCreateView(surfaceTexture.texture, C_NULL) |> Ref
         cntxt.currentTexture =
-            WGPUCore.GPUTextureView("swap chain", id, cntxt.device, nothing, size, nothing |> Ref)
+            WGPUCore.GPUTextureView("swap chain", currentTexture, cntxt.device, nothing, size, nothing |> Ref)
     end
     return cntxt.currentTexture
 end
 
 function WGPUCore.present(cntxt::GPUCanvasContext)
+	canvas = cntxt.canvasRef[]
     if cntxt.internal[] != C_NULL && cntxt.currentTexture.internal[] != C_NULL
-        wgpuSwapChainPresent(cntxt.internal[])
+        wgpuSurfacePresent(canvas.surfaceRef[])
     end
     WGPUCore.destroy(cntxt.currentTexture)
     cntxt.currentTexture = nothing
 end
 
-function createNativeSwapChainMaybe(canvasCntxt::GPUCanvasContext)
+function configureSurface(canvasCntxt::GPUCanvasContext)
     canvas = canvasCntxt.canvasRef[]
     pSize = canvasCntxt.physicalSize
     if pSize == canvasCntxt.surfaceSize
@@ -217,31 +222,35 @@ function createNativeSwapChainMaybe(canvasCntxt::GPUCanvasContext)
     canvasCntxt.surfaceSize = pSize
     canvasCntxt.usage = WGPUCore.getEnum(WGPUTextureUsage, ["RenderAttachment", "CopySrc"])
     presentMode = WGPUPresentMode_Fifo # TODO hardcoded (for other options ref https://docs.rs/wgpu/latest/wgpu/enum.PresentMode.html)
-    swapChainExtras = cStruct(
-        WGPUSwapChainDescriptorExtras;
-        alphaMode=WGPUCompositeAlphaMode_PreMultiplied,
-        viewFormatCount=1,
-        viewFormats = [canvasCntxt.format] |> pointer
-    )
-    swapChain =
+	surfaceCapabilities = cStruct(WGPUSurfaceCapabilities;)
+
+	wgpuSurfaceGetCapabilities(
+		canvas.surfaceRef[],
+		canvas.device.internal[],
+		surfaceCapabilities |> ptr
+	)
+
+    surfaceConfiguration =
         cStruct(
             WGPUSwapChainDescriptor;
+            device = canvasCntxt.device.internal[],
             usage = canvasCntxt.usage,
             format = canvasCntxt.format,
+            viewFormatCount = 1,
+            viewFormats = [canvasCntxt.format] |> pointer,
+            alphaMode = WGPUCompositeAlphaMode_Opaque,
             width = max(1, pSize[1]),
             height = max(1, pSize[2]),
             presentMode = presentMode,
-            nextInChain = swapChainExtras |> ptr
+            nextInChain = C_NULL,
         )
     if canvasCntxt.surfaceId == nothing
         canvasCntxt.surfaceId = getSurfaceIdFromCanvas(canvas)
     end
-    canvasCntxt.internal =
-        wgpuDeviceCreateSwapChain(
-            canvasCntxt.device.internal[],
-            canvasCntxt.surfaceId,
-            swapChain |> ptr,
-        ) |> Ref
+    wgpuSurfaceConfigure(
+        canvas.surfaceRef[],,
+        surfaceConfiguration |> ptr,
+    )
 end
 
 function WGPUCore.destroyWindow(canvas::GLFWWinCanvas)

src/metalglfw.jl

@@ -230,10 +230,7 @@ function WGPUCore.getCurrentTexture(cntxt::GPUCanvasContext)
     # end
     canvas = cntxt.canvasRef[]
     surface = canvas.surfaceRef[]
-    surfaceTexture = cStruct(
-    	WGPUSurfaceTexture;
-    )
-    
+    surfaceTexture = cStruct(WGPUSurfaceTexture;)
     if cntxt.currentTexture == nothing
         configureSurface(cntxt)
         wgpuSurfaceGetCurrentTexture(surface, surfaceTexture|>ptr)
@@ -274,12 +271,6 @@ function configureSurface(canvasCntxt::GPUCanvasContext)
     	surfaceCapabilities |> ptr
    	)
 
-    #swapChainExtras = cStruct(
-    #	WGPUSurfaceCapabilities;
-    #	alphaMode=WGPUCompositeAlphaMode_Premultiplied,
-    #	viewFormatCount=1,
-    #	viewFormats = [canvasCntxt.format] |> pointer
-    #)
     surfaceConfiguration =
         cStruct(
             WGPUSurfaceConfiguration;