mirror of
https://github.com/reactos/reactos.git
synced 2024-08-28 22:28:36 +00:00
[D3D8]
* Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove useless inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61322
This commit is contained in:
parent
143d9ab570
commit
22eaae4710
|
@ -16,11 +16,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static inline struct d3d8_vertexbuffer *impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, struct d3d8_vertexbuffer, IDirect3DVertexBuffer8_iface);
|
||||
|
|
|
@ -19,12 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <initguid.h>
|
||||
#include "d3d8_private.h"
|
||||
//#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
HRESULT WINAPI D3D8GetSWInfo(void) {
|
||||
FIXME("(void): stub\n");
|
||||
|
|
|
@ -23,6 +23,8 @@
|
|||
#ifndef __WINE_D3D8_PRIVATE_H
|
||||
#define __WINE_D3D8_PRIVATE_H
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
@ -36,7 +38,11 @@
|
|||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <wingdi.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
#include <initguid.h>
|
||||
#include <d3d8.h>
|
||||
#include <wine/wined3d.h>
|
||||
|
||||
|
|
|
@ -19,23 +19,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
//#include <math.h>
|
||||
//#include <stdarg.h>
|
||||
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "winuser.h"
|
||||
//#include "wingdi.h"
|
||||
//#include "wine/debug.h"
|
||||
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {}
|
||||
|
||||
static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops =
|
||||
|
|
|
@ -20,23 +20,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
//#include <stdarg.h>
|
||||
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "wingdi.h"
|
||||
//#include "winuser.h"
|
||||
//#include "wine/debug.h"
|
||||
//#include "wine/unicode.h"
|
||||
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static inline struct d3d8 *impl_from_IDirect3D8(IDirect3D8 *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, struct d3d8, IDirect3D8_iface);
|
||||
|
|
|
@ -17,11 +17,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static void STDMETHODCALLTYPE d3d8_vertexshader_wined3d_object_destroyed(void *parent)
|
||||
{
|
||||
struct d3d8_vertex_shader *shader = parent;
|
||||
|
|
|
@ -18,11 +18,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static inline struct d3d8_surface *impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, struct d3d8_surface, IDirect3DSurface8_iface);
|
||||
|
|
|
@ -18,11 +18,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static inline struct d3d8_swapchain *impl_from_IDirect3DSwapChain8(IDirect3DSwapChain8 *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, struct d3d8_swapchain, IDirect3DSwapChain8_iface);
|
||||
|
|
|
@ -16,11 +16,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static inline struct d3d8_texture *impl_from_IDirect3DTexture8(IDirect3DTexture8 *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
|
||||
|
|
|
@ -21,11 +21,8 @@
|
|||
/* IDirect3DVertexDeclaration8 is internal to our implementation.
|
||||
* It's not visible in the API. */
|
||||
|
||||
#include <config.h>
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static const char *debug_d3dvsdt_type(D3DVSDT_TYPE d3dvsdt_type)
|
||||
{
|
||||
switch (d3dvsdt_type)
|
||||
|
|
|
@ -18,11 +18,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "d3d8_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
|
||||
|
||||
static inline struct d3d8_volume *impl_from_IDirect3DVolume8(IDirect3DVolume8 *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, struct d3d8_volume, IDirect3DVolume8_iface);
|
||||
|
|
Loading…
Reference in a new issue