mirror of
https://github.com/reactos/reactos.git
synced 2024-08-28 22:28:36 +00:00
[D3DX9_36]
* Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61325
This commit is contained in:
parent
560a2a6824
commit
942db97a16
|
@ -17,19 +17,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
//#include <stdarg.h>
|
||||
|
||||
#define COBJMACROS
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "wingdi.h"
|
||||
#include <wine/debug.h>
|
||||
//#include "wine/unicode.h"
|
||||
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
struct ID3DXBufferImpl
|
||||
{
|
||||
ID3DXBuffer ID3DXBuffer_iface;
|
||||
|
|
|
@ -20,22 +20,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <config.h>
|
||||
//#include "wine/port.h"
|
||||
#include <initguid.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <wingdi.h>
|
||||
//#include "winuser.h"
|
||||
|
||||
#include <d3dx9.h>
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
/***********************************************************************
|
||||
* DllMain.
|
||||
|
|
|
@ -22,13 +22,20 @@
|
|||
#ifndef __WINE_D3DX9_36_PRIVATE_H
|
||||
#define __WINE_D3DX9_36_PRIVATE_H
|
||||
|
||||
#include <config.h>
|
||||
#include <wine/port.h>
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <initguid.h>
|
||||
|
||||
#define COBJMACROS
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <wingdi.h>
|
||||
|
@ -36,6 +43,11 @@
|
|||
#include <winuser.h>
|
||||
#include <d3dx9.h>
|
||||
|
||||
#include <wine/unicode.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array))
|
||||
|
||||
struct vec4
|
||||
|
|
|
@ -17,22 +17,12 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "wine/port.h"
|
||||
#define NONAMELESSUNION
|
||||
#include "wine/debug.h"
|
||||
#include "wine/unicode.h"
|
||||
|
||||
#include "windef.h"
|
||||
#include "wingdi.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
/* Constants for special INT/FLOAT conversation */
|
||||
#define INT_FLOAT_MULTI 255.0f
|
||||
#define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI)
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
enum STATE_CLASS
|
||||
{
|
||||
SC_LIGHTENABLE,
|
||||
|
|
|
@ -17,15 +17,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
//#include "wine/port.h"
|
||||
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
struct d3dx_font
|
||||
{
|
||||
ID3DXFont ID3DXFont_iface;
|
||||
|
|
|
@ -17,11 +17,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
typedef struct ID3DXLineImpl {
|
||||
ID3DXLine ID3DXLine_iface;
|
||||
LONG ref;
|
||||
|
|
|
@ -22,19 +22,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define NONAMELESSUNION
|
||||
|
||||
#include <config.h>
|
||||
#include "wine/port.h"
|
||||
|
||||
//#include "windef.h"
|
||||
//#include "wingdi.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
#include <wine/debug.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define copysignf(x, y) ((x) < 0.0f ? -fabsf(y) : fabsf(y))
|
||||
#endif
|
||||
|
|
|
@ -24,37 +24,21 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
#include <config.h>
|
||||
#include <wine/port.h>
|
||||
|
||||
#define COBJMACROS
|
||||
#define NONAMELESSUNION
|
||||
#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
#ifdef HAVE_FLOAT_H
|
||||
# include <float.h>
|
||||
#endif
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <wingdi.h>
|
||||
#include <d3dx9.h>
|
||||
|
||||
#undef MAKE_DDHRESULT
|
||||
#include "dxfile.h"
|
||||
#include "rmxfguid.h"
|
||||
#include "rmxftmpl.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/list.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
#define fmax(a, b) ((a) > (b) ? (a) : (b))
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
typedef struct ID3DXMeshImpl
|
||||
{
|
||||
ID3DXMesh ID3DXMesh_iface;
|
||||
|
|
|
@ -17,11 +17,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
struct device_state
|
||||
{
|
||||
DWORD num_render_targets;
|
||||
|
|
|
@ -18,19 +18,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
//#include "wine/port.h"
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
#include <wine/debug.h>
|
||||
//#include "wine/unicode.h"
|
||||
//#include "windef.h"
|
||||
//#include "wingdi.h"
|
||||
//#include "d3dx9.h"
|
||||
#include "d3dcompiler.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
#include "d3dcompiler.h"
|
||||
|
||||
/* This function is not declared in the SDK headers yet */
|
||||
HRESULT WINAPI D3DAssemble(LPCVOID data, SIZE_T datasize, LPCSTR filename,
|
||||
|
|
|
@ -18,11 +18,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
struct bone
|
||||
{
|
||||
char *name;
|
||||
|
|
|
@ -17,11 +17,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <wine/debug.h>
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
/* the combination of all possible D3DXSPRITE flags */
|
||||
#define D3DXSPRITE_FLAGLIMIT 511
|
||||
|
||||
|
|
|
@ -18,17 +18,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <wine/debug.h>
|
||||
//#include "wine/unicode.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
#include <initguid.h>
|
||||
#include <ole2.h>
|
||||
#include <wincodec.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
|
||||
/* Wine-specific WIC GUIDs */
|
||||
DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22);
|
||||
|
||||
|
|
|
@ -19,11 +19,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <wine/debug.h>
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
/* Returns TRUE if num is a power of 2, FALSE if not, or if 0 */
|
||||
static BOOL is_pow2(UINT num)
|
||||
{
|
||||
|
|
|
@ -17,11 +17,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <wine/debug.h>
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
static void la_from_rgba(const struct vec4 *rgba, struct vec4 *la)
|
||||
{
|
||||
la->x = rgba->x * 0.2125f + rgba->y * 0.7154f + rgba->z * 0.0721f;
|
||||
|
|
|
@ -16,11 +16,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
HRESULT WINAPI D3DXLoadVolumeFromFileA(IDirect3DVolume9 *dst_volume,
|
||||
const PALETTEENTRY *dst_palette,
|
||||
const D3DBOX *dst_box,
|
||||
|
|
|
@ -17,15 +17,12 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
|
||||
#include "d3dx9.h"
|
||||
#include "d3dx9xof.h"
|
||||
#undef MAKE_DDHRESULT
|
||||
#include "dxfile.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
static HRESULT error_dxfile_to_d3dxfile(HRESULT error)
|
||||
{
|
||||
switch (error)
|
||||
|
|
Loading…
Reference in a new issue