system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 07:57:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

glu32: Fix GCC 12.2 warnings.

Browse source 
GCC complains about writing 4x4 floats into a pointer to a float.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
Eric Pouech 2022-09-16 16:54:02 +02:00 committed by Alexandre Julliard
parent b9d07d6cb4
commit af0fa4b8a8
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dlls/glu32/project.c
View file

@ -37,20 +37,20 @@
/*
** Make m an identity matrix
*/
static void __gluMakeIdentityd(GLdouble m[16])
static void __gluMakeIdentityd(GLdouble m[4][4])
{
m[0+4*0] = 1; m[0+4*1] = 0; m[0+4*2] = 0; m[0+4*3] = 0;
m[1+4*0] = 0; m[1+4*1] = 1; m[1+4*2] = 0; m[1+4*3] = 0;
m[2+4*0] = 0; m[2+4*1] = 0; m[2+4*2] = 1; m[2+4*3] = 0;
m[3+4*0] = 0; m[3+4*1] = 0; m[3+4*2] = 0; m[3+4*3] = 1;
m[0][0] = 1; m[0][1] = 0; m[0][2] = 0; m[0][3] = 0;
m[1][0] = 0; m[1][1] = 1; m[1][2] = 0; m[1][3] = 0;
m[2][0] = 0; m[2][1] = 0; m[2][2] = 1; m[2][3] = 0;
m[3][0] = 0; m[3][1] = 0; m[3][2] = 0; m[3][3] = 1;
}
static void __gluMakeIdentityf(GLfloat m[16])
static void __gluMakeIdentityf(GLfloat m[4][4])
{
m[0+4*0] = 1; m[0+4*1] = 0; m[0+4*2] = 0; m[0+4*3] = 0;
m[1+4*0] = 0; m[1+4*1] = 1; m[1+4*2] = 0; m[1+4*3] = 0;
m[2+4*0] = 0; m[2+4*1] = 0; m[2+4*2] = 1; m[2+4*3] = 0;
m[3+4*0] = 0; m[3+4*1] = 0; m[3+4*2] = 0; m[3+4*3] = 1;
m[0][0] = 1; m[0][1] = 0; m[0][2] = 0; m[0][3] = 0;
m[1][0] = 0; m[1][1] = 1; m[1][2] = 0; m[1][3] = 0;
m[2][0] = 0; m[2][1] = 0; m[2][2] = 1; m[2][3] = 0;
m[3][0] = 0; m[3][1] = 0; m[3][2] = 0; m[3][3] = 1;
}
/***********************************************************************
@ -77,7 +77,7 @@ void WINAPI gluPerspective( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdo
}
cotangent = cos(radians) / sine;
__gluMakeIdentityd(&m[0][0]);
__gluMakeIdentityd(m);
m[0][0] = cotangent / aspect;
m[1][1] = cotangent;
m[2][2] = -(zFar + zNear) / deltaZ;
@ -133,7 +133,7 @@ void WINAPI gluLookAt( GLdouble eyex, GLdouble eyey, GLdouble eyez,
/* Recompute up as: up = side x forward */
cross(side, forward, up);
__gluMakeIdentityf(&m[0][0]);
__gluMakeIdentityf(m);
m[0][0] = side[0];
m[1][0] = side[1];
m[2][0] = side[2];