Commit fcf42ed1 authored by Bergmann89's avatar Bergmann89

Merge remote-tracking branch 'dglOpenGL/master'

Conflicts:
	readme
parents f0b025bf 37834ffc
{ ============================================================================
OpenGL 4.5 - Headertranslation
Version 4.5
Version 4.5a
Supported environments and targets :
- (Win32) Delphi 4 and up
- (Win32) Delphi 6 and up
- (Win32, Win64) Delphi XE2
- (Win32, Win64, Linux, MacOSX) FreePascal (1.9.3 and up)
......@@ -134,6 +134,17 @@ interface
{$A4}
{$ENDIF}
// 64 BIT architecture
// Free pascal
{$IFDEF CPU64}
{$DEFINE DGL_64BIT}
{$ENDIF}
// Delphi
{$IFDEF WIN64}
{$DEFINE DGL_64BIT}
{$ENDIF}
// generell options
{$H+,O+,X+}
......@@ -161,25 +172,20 @@ interface
{$ENDIF}
{$ENDIF}
// detecting 64 Bit CPU
{$IFDEF CPU64} // fpc on 64 bit cpus
{$DEFINE DGL_64BIT} // dgl define for 64 bit
{$ENDIF}
uses
{$IFDEF FPC}{$IFDEF DARWIN}dynlibs,{$ENDIF}{$ENDIF} // LoadLibrary functions
SysUtils
{$IFDEF DGL_WIN}, Windows{$ENDIF}
{$IFDEF DGL_64BIT} ,math {$ENDIF}
{$IFDEF DGL_LINUX}, X, XLib, XUtil{$ENDIF}
;
type
// Needed for Delphi 6 and less (defined in system.pas for Delphi 7)
PPointer = ^Pointer;
PCardinal = ^Cardinal;
{$IFDEF DELPHI6_AND_DOWN}
// Delphi 6 compatibility
PPointer = ^Pointer;
PCardinal = ^Cardinal;
{$ENDIF}
GLenum = Cardinal;
GLboolean = BYTEBOOL;
......@@ -376,6 +382,7 @@ type
TGLVector3f = TGLVectorf3;
// Datatypes corresponding to OpenGL12.pas for easy porting
TVector3f = TGLVectorf3;
TVector3d = TGLVectord3;
TVector4i = TGLVectori4;
......@@ -1026,8 +1033,8 @@ const
GL_STENCIL_BUFFER_BIT = $00000400;
GL_COLOR_BUFFER_BIT = $00004000;
{ Boolean }
GL_TRUE = 1;
GL_FALSE = 0;
GL_TRUE: ByteBool = True;
GL_FALSE: ByteBool = False;
{ BeginMode }
GL_POINTS = $0000;
GL_LINES = $0001;
......@@ -7637,8 +7644,8 @@ const
GLU_INCOMPATIBLE_GL_VERSION = 100903;
GLU_VERSION = 100800;
GLU_EXTENSIONS = 100801;
GLU_TRUE = GL_TRUE;
GLU_FALSE = GL_FALSE;
GLU_TRUE: ByteBool = True;
GLU_FALSE: ByteBool = False;
GLU_SMOOTH = 100000;
GLU_FLAT = 100001;
GLU_NONE = 100002;
......@@ -19401,7 +19408,7 @@ begin
GL_VERSION_4_3 := True;
if MinorVersion >= 4 then
GL_VERSION_4_4 := True;
if MinorVersion >= 4 then
if MinorVersion >= 5 then
GL_VERSION_4_5:= True;
end;
......@@ -20322,6 +20329,10 @@ initialization
{$IFDEF CPU386}
Set8087CW($133F);
{$ENDIF}
{$IFDEF DGL_64BIT}
SetExceptionMask([exInvalidOp, exDenormalized, exZeroDivide,exOverflow, exUnderflow, exPrecision]);
{$ENDIF}
finalization
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