winrt-Windows.Graphics.DirectX.Direct3D11.Interop 4.0.0__tar.gz → 4.1.0__tar.gz

{winrt_windows_graphics_directx_direct3d11_interop-4.0.0/winrt_Windows.Graphics.DirectX.Direct3D11.Interop.egg-info → winrt_windows_graphics_directx_direct3d11_interop-4.1.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: winrt-Windows.Graphics.DirectX.Direct3D11.Interop
-Version: 4.0.0
-Summary: Converts between DXGI devices and surfaces and the IDirect3DDevice and IDirect3DSurface that WinRT APIs take.
+Version: 4.1.0
+Summary: Creates a Direct3D 11 device, and converts between DXGI devices and surfaces and the IDirect3DDevice and IDirect3DSurface that WinRT APIs take.
 License-Expression: MIT
 Project-URL: Documentation, https://pywinrt.readthedocs.io
 Project-URL: Repository, https://github.com/pywinrt/pywinrt
@@ -28,7 +28,7 @@ Dynamic: license-file
 
 # winrt-Windows.Graphics.DirectX.Direct3D11.Interop
 
-Converts between DXGI devices and surfaces and the `IDirect3DDevice` and `IDirect3DSurface` that WinRT APIs take.
+Creates a Direct3D 11 device, and converts between DXGI devices and surfaces and the `IDirect3DDevice` and `IDirect3DSurface` that WinRT APIs take.
 
 This package provides the `winrt.windows.graphics.directx.direct3d11.interop` module.
 

{winrt_windows_graphics_directx_direct3d11_interop-4.0.0 → winrt_windows_graphics_directx_direct3d11_interop-4.1.0}/README.md

@@ -2,7 +2,7 @@
 
 # winrt-Windows.Graphics.DirectX.Direct3D11.Interop
 
-Converts between DXGI devices and surfaces and the `IDirect3DDevice` and `IDirect3DSurface` that WinRT APIs take.
+Creates a Direct3D 11 device, and converts between DXGI devices and surfaces and the `IDirect3DDevice` and `IDirect3DSurface` that WinRT APIs take.
 
 This package provides the `winrt.windows.graphics.directx.direct3d11.interop` module.
 

{winrt_windows_graphics_directx_direct3d11_interop-4.0.0 → winrt_windows_graphics_directx_direct3d11_interop-4.1.0}/py.Windows.Graphics.DirectX.Direct3D11.Interop.cpp

@@ -1,5 +1,10 @@
 #include "interop.h"
 
+#include <d3d11.h>
+
+#include <cstdint>
+#include <memory>
+
 #if __has_include("windows.graphics.directx.direct3d11.interop.h")
 #include <windows.graphics.directx.direct3d11.interop.h>
 
@@ -61,6 +66,18 @@ namespace
 {
     using ::Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess;
 
+    struct release_com
+    {
+        void operator()(::IUnknown* p) const noexcept
+        {
+            p->Release();
+        }
+    };
+
+    /// Owns a reference to a COM interface, which it releases.
+    template<typename I>
+    using com_owner = std::unique_ptr<I, release_com>;
+
     PyObject* create_direct3d11_device_from_dxgi_device(
         PyObject* /*unused*/, PyObject* dxgi_device_obj) noexcept
     {
@@ -82,6 +99,146 @@ namespace
         return interop::new_interface_capsule(d3d_device);
     }
 
+    /// PyLong_AsInt32() as Python 3.14 has it, which is how winrt-runtime
+    /// converts an enum that is not a flags enum.
+    /// @returns false with a Python error set.
+    bool as_int32(PyObject* obj, std::int32_t* value) noexcept
+    {
+#if PY_VERSION_HEX >= 0x030E0000
+        return PyLong_AsInt32(obj, value) == 0;
+#else
+        // a long is 32 bits on Windows, so this raises OverflowError for what
+        // does not fit, as PyLong_AsInt32() does
+        auto const result = PyLong_AsLong(obj);
+        if (result == -1 && PyErr_Occurred())
+        {
+            return false;
+        }
+
+        *value = result;
+        return true;
+#endif
+    }
+
+    /// PyLong_AsUInt32() as Python 3.14 has it, which is how winrt-runtime
+    /// converts a flags enum: a negative number raises ValueError and one too
+    /// large OverflowError.
+    /// @returns false with a Python error set.
+    bool as_uint32(PyObject* obj, std::uint32_t* value) noexcept
+    {
+#if PY_VERSION_HEX >= 0x030E0000
+        return PyLong_AsUInt32(obj, value) == 0;
+#else
+        // This goes when the oldest Python supported is 3.14.
+        auto const result = PyLong_AsLongLong(obj);
+        if (result == -1 && PyErr_Occurred())
+        {
+            return false;
+        }
+
+        if (result < 0)
+        {
+            PyErr_SetString(PyExc_ValueError, "Cannot convert negative int");
+            return false;
+        }
+
+        if (result > UINT32_MAX)
+        {
+            PyErr_SetString(
+                PyExc_OverflowError, "Python int too large to convert to C uint32_t");
+            return false;
+        }
+
+        *value = static_cast<std::uint32_t>(result);
+        return true;
+#endif
+    }
+
+    // https://learn.microsoft.com/en-us/windows/win32/api/d3d11/nf-d3d11-d3d11createdevice
+    PyObject* create_direct3d11_device(PyObject* /*unused*/, PyObject* args) noexcept
+    {
+        PyObject* driver_type_obj;
+        PyObject* flags_obj;
+
+        if (!PyArg_ParseTuple(args, "OO", &driver_type_obj, &flags_obj))
+        {
+            return nullptr;
+        }
+
+        std::int32_t driver_type;
+        if (!as_int32(driver_type_obj, &driver_type))
+        {
+            return nullptr;
+        }
+
+        // Only a value of D3D_DRIVER_TYPE may be cast to it. UNKNOWN and
+        // SOFTWARE are among them, and D3D11CreateDevice refuses them, since
+        // there is neither an adapter nor a software rasterizer.
+        if (driver_type < D3D_DRIVER_TYPE_UNKNOWN || driver_type > D3D_DRIVER_TYPE_WARP)
+        {
+            PyErr_Format(
+                PyExc_ValueError,
+                "%d is not a valid D3dDriverType",
+                static_cast<int>(driver_type));
+            return nullptr;
+        }
+
+        std::uint32_t flags;
+        if (!as_uint32(flags_obj, &flags))
+        {
+            return nullptr;
+        }
+
+        ID3D11Device* d3d11_device_abi{};
+        HRESULT hr;
+
+        {
+            // creating a hardware device can take tens of milliseconds
+            interop::gil_released const guard;
+            hr = D3D11CreateDevice(
+                nullptr,
+                static_cast<D3D_DRIVER_TYPE>(driver_type),
+                nullptr,
+                flags,
+                nullptr,
+                0,
+                D3D11_SDK_VERSION,
+                &d3d11_device_abi,
+                nullptr,
+                nullptr);
+        }
+
+        // Neither this nor QueryInterface() sets error info, so whatever is on
+        // the thread was left by some earlier call and is not taken.
+        if (FAILED(hr))
+        {
+            return interop::set_hresult_error(hr, nullptr);
+        }
+
+        // An error is raised before these are released, when the function
+        // returns, so a release cannot replace the error info it takes.
+        com_owner<ID3D11Device> const d3d11_device{d3d11_device_abi};
+
+        IDXGIDevice* dxgi_device_abi{};
+        hr = d3d11_device->QueryInterface(
+            __uuidof(IDXGIDevice), reinterpret_cast<void**>(&dxgi_device_abi));
+        if (FAILED(hr))
+        {
+            return interop::set_hresult_error(hr, nullptr);
+        }
+
+        com_owner<IDXGIDevice> const dxgi_device{dxgi_device_abi};
+
+        ::IInspectable* d3d_device{};
+        hr = CreateDirect3D11DeviceFromDXGIDevice(dxgi_device.get(), &d3d_device);
+        if (FAILED(hr))
+        {
+            return interop::set_hresult_error(hr);
+        }
+
+        return interop::new_interface_capsule(d3d_device);
+    }
+
     PyObject* create_direct3d11_surface_from_dxgi_surface(
         PyObject* /*unused*/, PyObject* dxgi_surface_obj) noexcept
     {
@@ -147,6 +304,7 @@ namespace
     }
 
     PyMethodDef module_methods[]{
+        {"create_direct3d11_device", create_direct3d11_device, METH_VARARGS, nullptr},
         {"create_direct3d11_device_from_dxgi_device",
          create_direct3d11_device_from_dxgi_device,
          METH_O,

{winrt_windows_graphics_directx_direct3d11_interop-4.0.0 → winrt_windows_graphics_directx_direct3d11_interop-4.1.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "winrt-Windows.Graphics.DirectX.Direct3D11.Interop"
-description = "Converts between DXGI devices and surfaces and the IDirect3DDevice and IDirect3DSurface that WinRT APIs take."
+description = "Creates a Direct3D 11 device, and converts between DXGI devices and surfaces and the IDirect3DDevice and IDirect3DSurface that WinRT APIs take."
 readme = "README.md"
 license = "MIT"
 license-files = ["LICENSE"]

winrt_windows_graphics_directx_direct3d11_interop-4.1.0/version.txt

@@ -0,0 +1 @@
+4.1.0

{winrt_windows_graphics_directx_direct3d11_interop-4.0.0 → winrt_windows_graphics_directx_direct3d11_interop-4.1.0}/winrt/_winrt_windows_graphics_directx_direct3d11_interop.pyi

@@ -1,5 +1,6 @@
 from winrt.runtime.interop import InterfaceCapsule
 
+def create_direct3d11_device(driver_type: int, flags: int, /) -> InterfaceCapsule: ...
 def create_direct3d11_device_from_dxgi_device(
     dxgi_device: int, /
 ) -> InterfaceCapsule: ...

{winrt_windows_graphics_directx_direct3d11_interop-4.0.0 → winrt_windows_graphics_directx_direct3d11_interop-4.1.0}/winrt/windows/graphics/directx/direct3d11/interop/__init__.py

@@ -1,3 +1,4 @@
+from enum import IntEnum, IntFlag
 from uuid import UUID
 
 import winrt.runtime.interop as _runtime
@@ -6,15 +7,64 @@ from winrt.system import Object
 from winrt.windows.graphics.directx.direct3d11 import IDirect3DDevice, IDirect3DSurface
 
 __all__ = [
+    "create_direct3d11_device",
     "create_direct3d11_device_from_dxgi_device",
     "create_direct3d11_surface_from_dxgi_surface",
     "get_dxgi_device_from_object",
     "get_dxgi_surface_from_object",
+    "D3dDriverType",
+    "D3d11CreateDeviceFlag",
 ]
 
 _IID_IINSPECTABLE = UUID("AF86E2E0-B12D-4C6A-9C5A-D7AA65101E90")
 
 
+# https://learn.microsoft.com/en-us/windows/win32/api/d3dcommon/ne-d3dcommon-d3d_driver_type
+# UNKNOWN and SOFTWARE are left out, since they need an adapter or a software
+# rasterizer that create_direct3d11_device() does not take.
+class D3dDriverType(IntEnum):
+    HARDWARE = 1
+    REFERENCE = 2
+    NULL = 3
+    WARP = 5
+
+
+# https://learn.microsoft.com/en-us/windows/win32/api/d3d11/ne-d3d11-d3d11_create_device_flag
+# SWITCH_TO_REF is left out, since Direct3D 11 does not support it.
+class D3d11CreateDeviceFlag(IntFlag):
+    SINGLE_THREADED = 0x1
+    DEBUG = 0x2
+    PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x8
+    BGRA_SUPPORT = 0x20
+    DEBUGGABLE = 0x40
+    PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY = 0x80
+    DISABLE_GPU_TIMEOUT = 0x100
+    VIDEO_SUPPORT = 0x800
+
+
+def create_direct3d11_device(
+    *,
+    driver_type: D3dDriverType = D3dDriverType.HARDWARE,
+    flags: D3d11CreateDeviceFlag = D3d11CreateDeviceFlag.BGRA_SUPPORT,
+) -> IDirect3DDevice:
+    """
+    Creates a Direct3D 11 device on the default adapter and wraps it in an
+    IDirect3DDevice.
+
+    Args:
+        driver_type: The driver to create the device with.
+        flags: The flags to create the device with. Windows.Graphics.Capture
+            needs BGRA_SUPPORT, which the default includes.
+
+    Returns:
+        A Direct3DDevice instance that wraps the new device.
+    """
+    return _runtime.wrap_interface(
+        _native.create_direct3d11_device(driver_type, flags),
+        IDirect3DDevice,
+    )
+
+
 def create_direct3d11_device_from_dxgi_device(dxgi_device: int, /) -> IDirect3DDevice:
     """
     Creates an instance of IDirect3DDevice from an IDXGIDevice.

{winrt_windows_graphics_directx_direct3d11_interop-4.0.0 → winrt_windows_graphics_directx_direct3d11_interop-4.1.0/winrt_Windows.Graphics.DirectX.Direct3D11.Interop.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: winrt-Windows.Graphics.DirectX.Direct3D11.Interop
-Version: 4.0.0
-Summary: Converts between DXGI devices and surfaces and the IDirect3DDevice and IDirect3DSurface that WinRT APIs take.
+Version: 4.1.0
+Summary: Creates a Direct3D 11 device, and converts between DXGI devices and surfaces and the IDirect3DDevice and IDirect3DSurface that WinRT APIs take.
 License-Expression: MIT
 Project-URL: Documentation, https://pywinrt.readthedocs.io
 Project-URL: Repository, https://github.com/pywinrt/pywinrt
@@ -28,7 +28,7 @@ Dynamic: license-file
 
 # winrt-Windows.Graphics.DirectX.Direct3D11.Interop
 
-Converts between DXGI devices and surfaces and the `IDirect3DDevice` and `IDirect3DSurface` that WinRT APIs take.
+Creates a Direct3D 11 device, and converts between DXGI devices and surfaces and the `IDirect3DDevice` and `IDirect3DSurface` that WinRT APIs take.
 
 This package provides the `winrt.windows.graphics.directx.direct3d11.interop` module.
 

winrt_windows_graphics_directx_direct3d11_interop-4.0.0/version.txt

@@ -1 +0,0 @@
-4.0.0