From 0f313c9f998c524d0aa523aee168f1e5b63e338f Mon Sep 17 00:00:00 2001 From: gloriouseggroll Date: Mon, 19 Feb 2018 16:14:53 -0500 Subject: [PATCH] wined3d-1DTextures: 0004,008 - update to use global memory alloc as changed in mainline --- .../0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch | 2 +- ...8-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/wined3d-1DTextures/0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch b/patches/wined3d-1DTextures/0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch index 705e9c07..d7fa4a2a 100644 --- a/patches/wined3d-1DTextures/0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch +++ b/patches/wined3d-1DTextures/0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch @@ -154,7 +154,7 @@ index 2a172ee..f81d7cf 100644 + } + + if (level_count > ~(SIZE_T)0 / layer_count -+ || !(surfaces = wined3d_calloc(level_count * layer_count, sizeof(*surfaces)))) ++ || !(surfaces = heap_calloc(level_count * layer_count, sizeof(*surfaces)))) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; diff --git a/patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch b/patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch index aaa02f2a..433e92cc 100644 --- a/patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch +++ b/patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch @@ -39,7 +39,7 @@ index c5a4f0c..198d2a6 100644 + { + WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n"); + -+ if (!(temporary_mem = wined3d_calloc(texture->layer_count, sub_resource->size))) ++ if (!(temporary_mem = heap_calloc(texture->layer_count, sub_resource->size))) + { + ERR("Out of memory.\n"); + return;