lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-02 17:31:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] d3dx9: Reimplement make_pow2() in d3dx9_private.h.

Browse Source 
Signed-off-by: Sven Baars <sbaars@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 1b0ad92db1c21d5052c45be2291759d60553476c by Sven Baars <sbaars@codeweavers.com>
This commit is contained in:
winesync
2020-09-21 23:03:27 +02:00
committed by Jérôme Gardou
parent 921935dfd6
commit 9cb965ea9b
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dll/directx/wine/d3dx9_36/d3dx9_private.h
View File

@@ -22,6 +22,7 @@
#ifndef __WINE_D3DX9_PRIVATE_H
#define __WINE_D3DX9_PRIVATE_H
#include <stdint.h>
#define NONAMELESSUNION
#include "wine/debug.h"
#include "wine/heap.h"
@@ -225,6 +226,24 @@ static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type)
|| type == D3DXPT_SAMPLER3D || type == D3DXPT_SAMPLERCUBE;
}
/* Returns the smallest power of 2 which is greater than or equal to num */
static inline uint32_t make_pow2(uint32_t num)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
return num == 1 ? 1 : 1u << ((__builtin_clz(num - 1) ^ 0x1f) + 1);
#else
num--;
num |= num >> 1;
num |= num >> 2;
num |= num >> 4;
num |= num >> 8;
num |= num >> 16;
num++;
return num;
#endif
}
struct d3dx_parameter;
enum pres_reg_tables

15
dll/directx/wine/d3dx9_36/texture.c
View File

@@ -34,21 +34,6 @@ static BOOL is_pow2(UINT num)
return !(num & (num - 1));
}
/* Returns the smallest power of 2 which is greater than or equal to num */
static UINT make_pow2(UINT num)
{
UINT result = 1;
/* In the unlikely event somebody passes a large value, make sure we don't enter an infinite loop */
if (num >= 0x80000000)
return 0x80000000;
while (result < num)
result <<= 1;
return result;
}
static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex,
int face, UINT level, struct IDirect3DSurface9 **surf)
{

2
sdk/tools/winesync/d3dx9.cfg
View File

@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: e0ce80561bf046c9dc7837e1c7f3c999f18b0361}
tags: {wine: 1b0ad92db1c21d5052c45be2291759d60553476c}