Commit 288da7c8 authored by Alexandre Julliard's avatar Alexandre Julliard

opengl32: Fix GLdouble type alignment on the Unix side.

parent 6b816b89
...@@ -241,8 +241,8 @@ GLint WINAPI gluProject( GLdouble objx, GLdouble objy, GLdouble objz, const GLdo ...@@ -241,8 +241,8 @@ GLint WINAPI gluProject( GLdouble objx, GLdouble objy, GLdouble objz, const GLdo
const GLdouble projMatrix[16], const GLint viewport[4], const GLdouble projMatrix[16], const GLint viewport[4],
GLdouble *winx, GLdouble *winy, GLdouble *winz ) GLdouble *winx, GLdouble *winy, GLdouble *winz )
{ {
double in[4]; GLdouble in[4];
double out[4]; GLdouble out[4];
in[0]=objx; in[0]=objx;
in[1]=objy; in[1]=objy;
...@@ -276,9 +276,9 @@ GLint WINAPI gluUnProject( GLdouble winx, GLdouble winy, GLdouble winz, const GL ...@@ -276,9 +276,9 @@ GLint WINAPI gluUnProject( GLdouble winx, GLdouble winy, GLdouble winz, const GL
const GLdouble projMatrix[16], const GLint viewport[4], const GLdouble projMatrix[16], const GLint viewport[4],
GLdouble *objx, GLdouble *objy, GLdouble *objz ) GLdouble *objx, GLdouble *objy, GLdouble *objz )
{ {
double finalMatrix[16]; GLdouble finalMatrix[16];
double in[4]; GLdouble in[4];
double out[4]; GLdouble out[4];
__gluMultMatricesd(modelMatrix, projMatrix, finalMatrix); __gluMultMatricesd(modelMatrix, projMatrix, finalMatrix);
if (!__gluInvertMatrixd(finalMatrix, finalMatrix)) return(GL_FALSE); if (!__gluInvertMatrixd(finalMatrix, finalMatrix)) return(GL_FALSE);
......
...@@ -133,6 +133,7 @@ my %remap_types = ...@@ -133,6 +133,7 @@ my %remap_types =
my %khronos_types = my %khronos_types =
( (
"double" => "double DECLSPEC_ALIGN(8)",
"khronos_int8_t" => "signed char", "khronos_int8_t" => "signed char",
"khronos_uint8_t" => "unsigned char", "khronos_uint8_t" => "unsigned char",
"khronos_int16_t" => "short", "khronos_int16_t" => "short",
......
...@@ -21,8 +21,8 @@ typedef int GLclampx; ...@@ -21,8 +21,8 @@ typedef int GLclampx;
typedef int GLsizei; typedef int GLsizei;
typedef float GLfloat; typedef float GLfloat;
typedef float GLclampf; typedef float GLclampf;
typedef double GLdouble; typedef double DECLSPEC_ALIGN(8) GLdouble;
typedef double GLclampd; typedef double DECLSPEC_ALIGN(8) GLclampd;
typedef void *GLeglClientBufferEXT; typedef void *GLeglClientBufferEXT;
typedef void *GLeglImageOES; typedef void *GLeglImageOES;
typedef char GLchar; typedef char GLchar;
......
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