Commit e4253fd8 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

ddraw: Constify some variables.

parent 25142a27
...@@ -598,10 +598,10 @@ const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl; ...@@ -598,10 +598,10 @@ const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl;
(((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1)
void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, WINED3DFORMAT WineD3DFormat); void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, WINED3DFORMAT WineD3DFormat);
WINED3DFORMAT PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat); WINED3DFORMAT PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat);
void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd); void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd);
void DDRAW_dump_pixelformat(const DDPIXELFORMAT *PixelFormat); void DDRAW_dump_pixelformat(const DDPIXELFORMAT *PixelFormat);
void dump_D3DMATRIX(D3DMATRIX *mat); void dump_D3DMATRIX(const D3DMATRIX *mat);
void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps); void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps);
DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); DWORD get_flexible_vertex_size(DWORD d3dvtVertexType);
void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in); void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in);
...@@ -609,7 +609,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel); ...@@ -609,7 +609,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel);
/* This only needs to be here as long the processvertices functionality of /* This only needs to be here as long the processvertices functionality of
* IDirect3DExecuteBuffer isn't in WineD3D */ * IDirect3DExecuteBuffer isn't in WineD3D */
void multiply_matrix(LPD3DMATRIX dest, LPD3DMATRIX src1, LPD3DMATRIX src2); void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2);
/* Used for generic dumping */ /* Used for generic dumping */
typedef struct typedef struct
......
...@@ -55,14 +55,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7); ...@@ -55,14 +55,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
* *
*****************************************************************************/ *****************************************************************************/
static void _dump_executedata(LPD3DEXECUTEDATA lpData) { static void _dump_executedata(const D3DEXECUTEDATA *lpData) {
DPRINTF("dwSize : %d\n", lpData->dwSize); DPRINTF("dwSize : %d\n", lpData->dwSize);
DPRINTF("Vertex Offset : %d Count : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount); DPRINTF("Vertex Offset : %d Count : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount);
DPRINTF("Instruction Offset : %d Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength); DPRINTF("Instruction Offset : %d Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
DPRINTF("HVertex Offset : %d\n", lpData->dwHVertexOffset); DPRINTF("HVertex Offset : %d\n", lpData->dwHVertexOffset);
} }
static void _dump_D3DEXECUTEBUFFERDESC(LPD3DEXECUTEBUFFERDESC lpDesc) { static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) {
DPRINTF("dwSize : %d\n", lpDesc->dwSize); DPRINTF("dwSize : %d\n", lpDesc->dwSize);
DPRINTF("dwFlags : %x\n", lpDesc->dwFlags); DPRINTF("dwFlags : %x\n", lpDesc->dwFlags);
DPRINTF("dwCaps : %x\n", lpDesc->dwCaps); DPRINTF("dwCaps : %x\n", lpDesc->dwCaps);
......
...@@ -158,7 +158,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface, ...@@ -158,7 +158,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface,
* DDERR_INVALIDPARAMS if Light is NULL * DDERR_INVALIDPARAMS if Light is NULL
* *
*****************************************************************************/ *****************************************************************************/
static void dump_light(LPD3DLIGHT2 light) static void dump_light(const D3DLIGHT2 *light)
{ {
DPRINTF(" - dwSize : %d\n", light->dwSize); DPRINTF(" - dwSize : %d\n", light->dwSize);
} }
......
...@@ -95,7 +95,7 @@ static CRITICAL_SECTION ddraw_list_cs = { &ddraw_list_cs_debug, -1, 0, 0, 0, 0 } ...@@ -95,7 +95,7 @@ static CRITICAL_SECTION ddraw_list_cs = { &ddraw_list_cs_debug, -1, 0, 0, 0, 0 }
* *
***********************************************************************/ ***********************************************************************/
static HRESULT static HRESULT
DDRAW_Create(GUID *guid, DDRAW_Create(const GUID *guid,
void **DD, void **DD,
IUnknown *UnkOuter, IUnknown *UnkOuter,
REFIID iid) REFIID iid)
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d7); WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);
static void dump_material(LPD3DMATERIAL mat) static void dump_material(const D3DMATERIAL *mat)
{ {
DPRINTF(" dwSize : %d\n", mat->dwSize); DPRINTF(" dwSize : %d\n", mat->dwSize);
} }
......
...@@ -337,7 +337,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, ...@@ -337,7 +337,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat,
* WINED3DFMT_UNKNOWN if a matching format wasn't found * WINED3DFMT_UNKNOWN if a matching format wasn't found
*****************************************************************************/ *****************************************************************************/
WINED3DFORMAT WINED3DFORMAT
PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat) PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat)
{ {
TRACE("Convert a DirectDraw Pixelformat to a WineD3D Pixelformat\n"); TRACE("Convert a DirectDraw Pixelformat to a WineD3D Pixelformat\n");
if(TRACE_ON(ddraw)) if(TRACE_ON(ddraw))
...@@ -874,7 +874,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) ...@@ -874,7 +874,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd)
} }
void void
dump_D3DMATRIX(D3DMATRIX *mat) dump_D3DMATRIX(const D3DMATRIX *mat)
{ {
DPRINTF(" %f %f %f %f\n", mat->_11, mat->_12, mat->_13, mat->_14); DPRINTF(" %f %f %f %f\n", mat->_11, mat->_12, mat->_13, mat->_14);
DPRINTF(" %f %f %f %f\n", mat->_21, mat->_22, mat->_23, mat->_24); DPRINTF(" %f %f %f %f\n", mat->_21, mat->_22, mat->_23, mat->_24);
...@@ -1129,8 +1129,8 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) ...@@ -1129,8 +1129,8 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
*****************************************************************************/ *****************************************************************************/
void void
multiply_matrix(D3DMATRIX *dest, multiply_matrix(D3DMATRIX *dest,
D3DMATRIX *src1, const D3DMATRIX *src1,
D3DMATRIX *src2) const D3DMATRIX *src2)
{ {
D3DMATRIX temp; D3DMATRIX temp;
......
...@@ -95,7 +95,7 @@ void viewport_activate(IDirect3DViewportImpl* This) { ...@@ -95,7 +95,7 @@ void viewport_activate(IDirect3DViewportImpl* This) {
* Writes viewport information to TRACE * Writes viewport information to TRACE
* *
*****************************************************************************/ *****************************************************************************/
static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp) static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp)
{ {
TRACE(" - dwSize = %d dwX = %d dwY = %d\n", TRACE(" - dwSize = %d dwX = %d dwY = %d\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY); lpvp->dwSize, lpvp->dwX, lpvp->dwY);
...@@ -109,7 +109,7 @@ static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp) ...@@ -109,7 +109,7 @@ static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp)
lpvp->dvMinZ, lpvp->dvMaxZ); lpvp->dvMinZ, lpvp->dvMaxZ);
} }
static void _dump_D3DVIEWPORT2(D3DVIEWPORT2 *lpvp) static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp)
{ {
TRACE(" - dwSize = %d dwX = %d dwY = %d\n", TRACE(" - dwSize = %d dwX = %d dwY = %d\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY); lpvp->dwSize, lpvp->dwX, lpvp->dwY);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment