ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Cast-qual warnings fix.

This commit is contained in:
Andrew Talbot 2006-11-24 14:15:06 +00:00 committed by Alexandre Julliard
parent 5381dd2cf6
commit f3a515ce19
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/device.c
View File

@ -2574,7 +2574,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, W
glMatrixMode(GL_MODELVIEW);
checkGLcall("glMatrixMode(GL_MODELVIEW)");
glPushMatrix();
glLoadMatrixf((float *)lpmatrix);
glLoadMatrixf((const float *)lpmatrix);
checkGLcall("glLoadMatrixf(...)");
/* Reset lights */
@ -2629,7 +2629,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface
FIXME("Unhandled transform state!!\n");
}
multiply_matrix(&temp, mat, (WINED3DMATRIX *) pMatrix);
multiply_matrix(&temp, mat, (const WINED3DMATRIX *) pMatrix);
/* Apply change via set transform - will reapply to eg. lights this way */
return IWineD3DDeviceImpl_SetTransform(iface, State, &temp);
@ -6720,7 +6720,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
int j;
/* hopefully using pointer addtion will be quicker than using a point + j * rowoffset */
unsigned char* data =((unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset;
const unsigned char* data =((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset;
for(j = destTop ; j < (srcHeight + destTop) ; j++){

2
dlls/wined3d/utils.c
View File

@ -2450,7 +2450,7 @@ WINED3DFORMAT pixelformat_for_depth(DWORD depth) {
}
}
void multiply_matrix(WINED3DMATRIX *dest, WINED3DMATRIX *src1, WINED3DMATRIX *src2) {
void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2) {
WINED3DMATRIX temp;
/* Now do the multiplication 'by hand'.

2
dlls/wined3d/wined3d_private.h
View File

@ -1272,7 +1272,7 @@ void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords)
int D3DFmtMakeGlCfg(WINED3DFORMAT BackBufferFormat, WINED3DFORMAT StencilBufferFormat, int *attribs, int* nAttribs, BOOL alternate);
/* Math utils */
void multiply_matrix(WINED3DMATRIX *dest, WINED3DMATRIX *src1, WINED3DMATRIX *src2);
void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2);
/*****************************************************************************
* To enable calling of inherited functions, requires prototypes