mirror of
https://github.com/reactos/reactos.git
synced 2024-10-01 23:14:53 +00:00
- fix glEdgeFlagPointe prototype
- clean up opengl32.h a bit svn path=/trunk/; revision=39922
This commit is contained in:
parent
3ec78e9525
commit
468100e628
|
@ -86,7 +86,7 @@
|
|||
X(glDrawElements, void, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices), (mode,count,type,indices), 311, 149, 16) \
|
||||
X(glDrawPixels, void, (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels), (width,height,format,type,pixels), 257, -1, 20) \
|
||||
X(glEdgeFlag, void, (GLboolean flag), (flag), 41, 35, 4) \
|
||||
X(glEdgeFlagPointer, void, (GLsizei stride, const GLboolean *pointer), (stride,pointer), 312, 150, 8) \
|
||||
X(glEdgeFlagPointer, void, (GLsizei stride, const GLvoid *pointer), (stride,pointer), 312, 150, 8) \
|
||||
X(glEdgeFlagv, void, (const GLboolean *flag), (flag), 42, 36, 4) \
|
||||
X(glEnable, void, (GLenum cap), (cap), 215, 117, 4) \
|
||||
X(glEnableClientState, void, (GLenum array), (array), 313, 151, 4) \
|
||||
|
|
|
@ -33,15 +33,14 @@ extern "C" {
|
|||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_NO_STATUS
|
||||
#include <windows.h>
|
||||
|
||||
#include <winreg.h>
|
||||
|
||||
#define NTOS_MODE_USER
|
||||
#include <ddraw.h>
|
||||
#include <ddrawi.h>
|
||||
#include <winddi.h>
|
||||
#include <ndk/ntndk.h>
|
||||
|
||||
#include <GL/gl.h>
|
||||
|
||||
/* gl function list */
|
||||
#include "glfuncs.h"
|
||||
|
||||
|
@ -61,7 +60,6 @@ extern "C" {
|
|||
|
||||
/* debug macros */
|
||||
# ifdef DEBUG_OPENGL32
|
||||
ULONG DbgPrint(PCH Format,...);
|
||||
# include <debug.h>
|
||||
# define DBGPRINT( fmt, args... ) \
|
||||
DPRINT( "OpenGL32.DLL: %s: "fmt"\n", __FUNCTION__, ##args )
|
||||
|
@ -107,27 +105,6 @@ ULONG DbgPrint(PCH Format,...);
|
|||
#endif /* APIENTRY */
|
||||
#define APIENTRY EXPORT __stdcall
|
||||
|
||||
/* gl function list */
|
||||
#include "glfuncs.h"
|
||||
|
||||
/* GL data types - x86 typedefs */
|
||||
typedef unsigned int GLenum;
|
||||
typedef unsigned char GLboolean;
|
||||
typedef unsigned int GLbitfield;
|
||||
typedef signed char GLbyte;
|
||||
typedef short GLshort;
|
||||
typedef int GLint;
|
||||
typedef int GLsizei;
|
||||
typedef unsigned char GLubyte;
|
||||
typedef unsigned short GLushort;
|
||||
typedef unsigned int GLuint;
|
||||
typedef unsigned short GLhalf;
|
||||
typedef float GLfloat;
|
||||
typedef float GLclampf;
|
||||
typedef double GLdouble;
|
||||
typedef double GLclampd;
|
||||
typedef void GLvoid;
|
||||
|
||||
/* Called by the driver to set the dispatch table */
|
||||
typedef DWORD (WINAPI *SetContextCallBack)( const ICDTable * );
|
||||
|
||||
|
|
Loading…
Reference in a new issue