Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-23 09:43:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[D3D9]

Browse source 
* 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=61323
This commit is contained in:
Amine Khaldi 2013-12-21 15:33:19 +00:00
parent 22eaae4710
commit 6826772bca
13 changed files with 6 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/directx/wine/d3d9/buffer.c
View file

@ -18,11 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_vertexbuffer *impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface)
{
return CONTAINING_RECORD(iface, struct d3d9_vertexbuffer, IDirect3DVertexBuffer9_iface);

4
reactos/dll/directx/wine/d3d9/d3d9_main.c
View file

@ -21,12 +21,8 @@
*
*/
#include <config.h>
#include <initguid.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static int D3DPERF_event_level = 0;
void WINAPI DebugSetMute(void) {

9
reactos/dll/directx/wine/d3d9/d3d9_private.h
View file

@ -23,6 +23,8 @@
#ifndef __WINE_D3D9_PRIVATE_H
#define __WINE_D3D9_PRIVATE_H
#include <config.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
@ -36,10 +38,11 @@
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
#include <wine/debug.h>
//#include "wine/unicode.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
#include <initguid.h>
#include <d3d9.h>
#include <wine/wined3d.h>

3
reactos/dll/directx/wine/d3d9/device.c
View file

@ -20,11 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {}
static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops =

3
reactos/dll/directx/wine/d3d9/directx.c
View file

@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9 *impl_from_IDirect3D9Ex(IDirect3D9Ex *iface)
{
return CONTAINING_RECORD(iface, struct d3d9, IDirect3D9Ex_iface);

3
reactos/dll/directx/wine/d3d9/query.c
View file

@ -20,11 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface)
{
return CONTAINING_RECORD(iface, struct d3d9_query, IDirect3DQuery9_iface);

3
reactos/dll/directx/wine/d3d9/shader.c
View file

@ -17,11 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_vertexshader *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface)
{
return CONTAINING_RECORD(iface, struct d3d9_vertexshader, IDirect3DVertexShader9_iface);

3
reactos/dll/directx/wine/d3d9/stateblock.c
View file

@ -20,11 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_stateblock *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9 *iface)
{
return CONTAINING_RECORD(iface, struct d3d9_stateblock, IDirect3DStateBlock9_iface);

3
reactos/dll/directx/wine/d3d9/surface.c
View file

@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_surface *impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface)
{
return CONTAINING_RECORD(iface, struct d3d9_surface, IDirect3DSurface9_iface);

3
reactos/dll/directx/wine/d3d9/swapchain.c
View file

@ -20,11 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_swapchain *impl_from_IDirect3DSwapChain9(IDirect3DSwapChain9 *iface)
{
return CONTAINING_RECORD(iface, struct d3d9_swapchain, IDirect3DSwapChain9_iface);

3
reactos/dll/directx/wine/d3d9/texture.c
View file

@ -18,11 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_texture *impl_from_IDirect3DTexture9(IDirect3DTexture9 *iface)
{
return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);

3
reactos/dll/directx/wine/d3d9/vertexdeclaration.c
View file

@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static const struct
{
enum wined3d_format_id format;

3
reactos/dll/directx/wine/d3d9/volume.c
View file

@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
static inline struct d3d9_volume *impl_from_IDirect3DVolume9(IDirect3DVolume9 *iface)
{
return CONTAINING_RECORD(iface, struct d3d9_volume, IDirect3DVolume9_iface);