Skip to content

W
wine-cw
Commit bbb71620 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

opengl32: Get type definitions from the XML files.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent fd3d5d6f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 82 deletions
dlls/opengl32/opengl_ext.c
View file @ bbb71620
......@@ -940,7 +940,7 @@ static void WINAPI glBufferStorage( GLenum target, GLsizeiptr size, const void *
funcs->ext.p_glBufferStorage( target, size, data, flags );
}
static void WINAPI glBufferStorageExternalEXT( GLenum target, GLintptr offset, GLsizeiptr size, void * clientBuffer, GLbitfield flags )
static void WINAPI glBufferStorageExternalEXT( GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags )
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE( "(%d, %ld, %ld, %p, %d)\n", target, offset, size, clientBuffer, flags );
......@@ -2270,7 +2270,7 @@ static void WINAPI glCreateStatesNV( GLsizei n, GLuint *states )
funcs->ext.p_glCreateStatesNV( n, states );
}
static GLsync WINAPI glCreateSyncFromCLeventARB( void *context, void *event, GLbitfield flags )
static GLsync WINAPI glCreateSyncFromCLeventARB( struct _cl_context *context, struct _cl_event *event, GLbitfield flags )
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE( "(%p, %p, %d)\n", context, event, flags );
......@@ -2319,21 +2319,21 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index )
funcs->ext.p_glCurrentPaletteMatrixARB( index );
}
static void WINAPI glDebugMessageCallback( void * callback, const void *userParam )
static void WINAPI glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam )
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE( "(%p, %p)\n", callback, userParam );
funcs->ext.p_glDebugMessageCallback( callback, userParam );
}
static void WINAPI glDebugMessageCallbackAMD( void * callback, void *userParam )
static void WINAPI glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam )
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE( "(%p, %p)\n", callback, userParam );
funcs->ext.p_glDebugMessageCallbackAMD( callback, userParam );
}
static void WINAPI glDebugMessageCallbackARB( void * callback, const void *userParam )
static void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam )
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE( "(%p, %p)\n", callback, userParam );
......@@ -6836,7 +6836,7 @@ static void WINAPI glGetVideouivNV( GLuint video_slot, GLenum pname, GLuint *par
funcs->ext.p_glGetVideouivNV( video_slot, pname, params );
}
static void * WINAPI glGetVkProcAddrNV( const GLchar *name )
static GLVULKANPROCNV WINAPI glGetVkProcAddrNV( const GLchar *name )
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE( "(%p)\n", name );
......@@ -9804,7 +9804,7 @@ static void WINAPI glNamedBufferStorageEXT( GLuint buffer, GLsizeiptr size, cons
funcs->ext.p_glNamedBufferStorageEXT( buffer, size, data, flags );
}
static void WINAPI glNamedBufferStorageExternalEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, void * clientBuffer, GLbitfield flags )
static void WINAPI glNamedBufferStorageExternalEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags )
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE( "(%d, %ld, %ld, %p, %d)\n", buffer, offset, size, clientBuffer, flags );
......
dlls/opengl32/opengl_norm.c
View file @ bbb71620
......@@ -2826,7 +2826,7 @@ static void null_glBufferPageCommitmentARB( GLenum target, GLintptr offset, GLsi
static void null_glBufferParameteriAPPLE( GLenum target, GLenum pname, GLint param ) { }
static GLuint null_glBufferRegionEnabled(void) { return 0; }
static void null_glBufferStorage( GLenum target, GLsizeiptr size, const void *data, GLbitfield flags ) { }
static void null_glBufferStorageExternalEXT( GLenum target, GLintptr offset, GLsizeiptr size, void * clientBuffer, GLbitfield flags ) { }
static void null_glBufferStorageExternalEXT( GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags ) { }
static void null_glBufferStorageMemEXT( GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset ) { }
static void null_glBufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, const void *data ) { }
static void null_glBufferSubDataARB( GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data ) { }
......@@ -3016,16 +3016,16 @@ static GLhandleARB null_glCreateShaderObjectARB( GLenum shaderType ) { return 0;
static GLuint null_glCreateShaderProgramEXT( GLenum type, const GLchar *string ) { return 0; }
static GLuint null_glCreateShaderProgramv( GLenum type, GLsizei count, const GLchar *const*strings ) { return 0; }
static void null_glCreateStatesNV( GLsizei n, GLuint *states ) { }
static GLsync null_glCreateSyncFromCLeventARB( void *context, void *event, GLbitfield flags ) { return 0; }
static GLsync null_glCreateSyncFromCLeventARB( struct _cl_context *context, struct _cl_event *event, GLbitfield flags ) { return 0; }
static void null_glCreateTextures( GLenum target, GLsizei n, GLuint *textures ) { }
static void null_glCreateTransformFeedbacks( GLsizei n, GLuint *ids ) { }
static void null_glCreateVertexArrays( GLsizei n, GLuint *arrays ) { }
static void null_glCullParameterdvEXT( GLenum pname, GLdouble *params ) { }
static void null_glCullParameterfvEXT( GLenum pname, GLfloat *params ) { }
static void null_glCurrentPaletteMatrixARB( GLint index ) { }
static void null_glDebugMessageCallback( void * callback, const void *userParam ) { }
static void null_glDebugMessageCallbackAMD( void * callback, void *userParam ) { }
static void null_glDebugMessageCallbackARB( void * callback, const void *userParam ) { }
static void null_glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam ) { }
static void null_glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam ) { }
static void null_glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam ) { }
static void null_glDebugMessageControl( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled ) { }
static void null_glDebugMessageControlARB( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled ) { }
static void null_glDebugMessageEnableAMD( GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled ) { }
......@@ -3669,7 +3669,7 @@ static void null_glGetVideoi64vNV( GLuint video_slot, GLenum pname, GLint64EXT *
static void null_glGetVideoivNV( GLuint video_slot, GLenum pname, GLint *params ) { }
static void null_glGetVideoui64vNV( GLuint video_slot, GLenum pname, GLuint64EXT *params ) { }
static void null_glGetVideouivNV( GLuint video_slot, GLenum pname, GLuint *params ) { }
static void * null_glGetVkProcAddrNV( const GLchar *name ) { return 0; }
static GLVULKANPROCNV null_glGetVkProcAddrNV( const GLchar *name ) { return 0; }
static void null_glGetnColorTable( GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table ) { }
static void null_glGetnColorTableARB( GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table ) { }
static void null_glGetnCompressedTexImage( GLenum target, GLint lod, GLsizei bufSize, void *pixels ) { }
......@@ -4093,7 +4093,7 @@ static void null_glNamedBufferPageCommitmentARB( GLuint buffer, GLintptr offset,
static void null_glNamedBufferPageCommitmentEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit ) { }
static void null_glNamedBufferStorage( GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags ) { }
static void null_glNamedBufferStorageEXT( GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags ) { }
static void null_glNamedBufferStorageExternalEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, void * clientBuffer, GLbitfield flags ) { }
static void null_glNamedBufferStorageExternalEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags ) { }
static void null_glNamedBufferStorageMemEXT( GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset ) { }
static void null_glNamedBufferSubData( GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data ) { }
static void null_glNamedBufferSubDataEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data ) { }
......
dlls/opengl32/tests/opengl.c
View file @ bbb71620
......@@ -24,7 +24,6 @@
#include "wine/wgl.h"
#define MAX_FORMATS 256
DECLARE_HANDLE(HPBUFFERARB);
/* WGL_ARB_create_context */
static HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList);
......
dlls/opengl32/winegl.xml
View file @ bbb71620
......@@ -22,6 +22,24 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
</comment>
<types>
<!-- Override some types for Win32 API -->
<type>typedef INT_PTR <name>GLintptr</name>;</type>
<type>typedef INT_PTR <name>GLsizeiptr</name>;</type>
<type>typedef INT64 <name>GLint64</name>;</type>
<type>typedef UINT64 <name>GLuint64</name>;</type>
<type>typedef INT_PTR <name>GLintptrARB</name>;</type>
<type>typedef INT_PTR <name>GLsizeiptrARB</name>;</type>
<type>typedef INT64 <name>GLint64EXT</name>;</type>
<type>typedef UINT64 <name>GLuint64EXT</name>;</type>
<type>typedef unsigned int <name>GLhandleARB</name>;</type>
<type>typedef void *<name>GLDEBUGPROC</name>;</type>
<type>typedef void *<name>GLDEBUGPROCAMD</name>;</type>
<type>typedef void *<name>GLDEBUGPROCARB</name>;</type>
<type>typedef void *<name>GLDEBUGPROCKHR</name>;</type>
<type>typedef void *<name>GLVULKANPROCNV</name>;</type>
</types>
<commands namespace="GL">
<command>
<proto>GLint <name>glDebugEntry</name></proto>
......
include/wine/wgl.h
View file @ bbb71620
......@@ -10,38 +10,64 @@
#undef near
#undef far
typedef unsigned int GLbitfield;
typedef unsigned char GLboolean;
typedef signed char GLbyte;
typedef char GLchar;
typedef char GLcharARB;
typedef double GLclampd;
typedef float GLclampf;
typedef int GLclampx;
typedef double GLdouble;
typedef unsigned int GLenum;
typedef int GLfixed;
typedef float GLfloat;
typedef unsigned short GLhalfNV;
typedef unsigned int GLhandleARB;
typedef int GLint;
typedef INT64 GLint64;
typedef INT64 GLint64EXT;
typedef INT_PTR GLintptr;
typedef INT_PTR GLintptrARB;
typedef short GLshort;
typedef int GLsizei;
typedef INT_PTR GLsizeiptr;
typedef INT_PTR GLsizeiptrARB;
typedef const unsigned char * GLstring;
typedef struct __GLsync * GLsync;
typedef unsigned char GLubyte;
typedef unsigned int GLuint;
typedef UINT64 GLuint64;
typedef UINT64 GLuint64EXT;
typedef unsigned short GLushort;
typedef INT_PTR GLvdpauSurfaceNV;
typedef void GLvoid;
typedef unsigned int GLenum;
typedef unsigned char GLboolean;
typedef unsigned int GLbitfield;
typedef void GLvoid;
typedef signed char GLbyte;
typedef short GLshort;
typedef int GLint;
typedef int GLclampx;
typedef unsigned char GLubyte;
typedef unsigned short GLushort;
typedef unsigned int GLuint;
typedef int GLsizei;
typedef float GLfloat;
typedef float GLclampf;
typedef double GLdouble;
typedef double GLclampd;
typedef void *GLeglClientBufferEXT;
typedef void *GLeglImageOES;
typedef char GLchar;
typedef char GLcharARB;
typedef unsigned short GLhalfARB;
typedef unsigned short GLhalf;
typedef GLint GLfixed;
typedef INT_PTR GLintptr;
typedef INT_PTR GLsizeiptr;
typedef INT64 GLint64;
typedef UINT64 GLuint64;
typedef INT_PTR GLintptrARB;
typedef INT_PTR GLsizeiptrARB;
typedef INT64 GLint64EXT;
typedef UINT64 GLuint64EXT;
typedef struct __GLsync *GLsync;
struct _cl_context;
struct _cl_event;
typedef void *GLDEBUGPROC;
typedef void *GLDEBUGPROCARB;
typedef void *GLDEBUGPROCKHR;
typedef void *GLDEBUGPROCAMD;
typedef unsigned short GLhalfNV;
typedef GLintptr GLvdpauSurfaceNV;
typedef void *GLVULKANPROCNV;
struct _GPU_DEVICE {
DWORD cb;
CHAR DeviceName[32];
CHAR DeviceString[128];
DWORD Flags;
RECT rcVirtualScreen;
};
DECLARE_HANDLE(HPBUFFERARB);
DECLARE_HANDLE(HPBUFFEREXT);
DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
DECLARE_HANDLE(HPVIDEODEV);
DECLARE_HANDLE(HPGPUNV);
DECLARE_HANDLE(HGPUNV);
DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
typedef struct _GPU_DEVICE GPU_DEVICE;
typedef struct _GPU_DEVICE *PGPU_DEVICE;
typedef unsigned int GLhandleARB;
#define GL_1PASS_EXT 0x80A1
#define GL_1PASS_SGIS 0x80A1
......
include/wine/wgl_driver.h
View file @ bbb71620
......@@ -502,7 +502,7 @@ struct opengl_funcs
void (WINE_GLAPI *p_glBufferParameteriAPPLE)( GLenum target, GLenum pname, GLint param );
GLuint (WINE_GLAPI *p_glBufferRegionEnabled)(void);
void (WINE_GLAPI *p_glBufferStorage)( GLenum target, GLsizeiptr size, const void *data, GLbitfield flags );
void (WINE_GLAPI *p_glBufferStorageExternalEXT)( GLenum target, GLintptr offset, GLsizeiptr size, void * clientBuffer, GLbitfield flags );
void (WINE_GLAPI *p_glBufferStorageExternalEXT)( GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags );
void (WINE_GLAPI *p_glBufferStorageMemEXT)( GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset );
void (WINE_GLAPI *p_glBufferSubData)( GLenum target, GLintptr offset, GLsizeiptr size, const void *data );
void (WINE_GLAPI *p_glBufferSubDataARB)( GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data );
......@@ -692,16 +692,16 @@ struct opengl_funcs
GLuint (WINE_GLAPI *p_glCreateShaderProgramEXT)( GLenum type, const GLchar *string );
GLuint (WINE_GLAPI *p_glCreateShaderProgramv)( GLenum type, GLsizei count, const GLchar *const*strings );
void (WINE_GLAPI *p_glCreateStatesNV)( GLsizei n, GLuint *states );
GLsync (WINE_GLAPI *p_glCreateSyncFromCLeventARB)( void *context, void *event, GLbitfield flags );
GLsync (WINE_GLAPI *p_glCreateSyncFromCLeventARB)( struct _cl_context *context, struct _cl_event *event, GLbitfield flags );
void (WINE_GLAPI *p_glCreateTextures)( GLenum target, GLsizei n, GLuint *textures );
void (WINE_GLAPI *p_glCreateTransformFeedbacks)( GLsizei n, GLuint *ids );
void (WINE_GLAPI *p_glCreateVertexArrays)( GLsizei n, GLuint *arrays );
void (WINE_GLAPI *p_glCullParameterdvEXT)( GLenum pname, GLdouble *params );
void (WINE_GLAPI *p_glCullParameterfvEXT)( GLenum pname, GLfloat *params );
void (WINE_GLAPI *p_glCurrentPaletteMatrixARB)( GLint index );
void (WINE_GLAPI *p_glDebugMessageCallback)( void * callback, const void *userParam );
void (WINE_GLAPI *p_glDebugMessageCallbackAMD)( void * callback, void *userParam );
void (WINE_GLAPI *p_glDebugMessageCallbackARB)( void * callback, const void *userParam );
void (WINE_GLAPI *p_glDebugMessageCallback)( GLDEBUGPROC callback, const void *userParam );
void (WINE_GLAPI *p_glDebugMessageCallbackAMD)( GLDEBUGPROCAMD callback, void *userParam );
void (WINE_GLAPI *p_glDebugMessageCallbackARB)( GLDEBUGPROCARB callback, const void *userParam );
void (WINE_GLAPI *p_glDebugMessageControl)( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled );
void (WINE_GLAPI *p_glDebugMessageControlARB)( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled );
void (WINE_GLAPI *p_glDebugMessageEnableAMD)( GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled );
......@@ -1345,7 +1345,7 @@ struct opengl_funcs
void (WINE_GLAPI *p_glGetVideoivNV)( GLuint video_slot, GLenum pname, GLint *params );
void (WINE_GLAPI *p_glGetVideoui64vNV)( GLuint video_slot, GLenum pname, GLuint64EXT *params );
void (WINE_GLAPI *p_glGetVideouivNV)( GLuint video_slot, GLenum pname, GLuint *params );
void * (WINE_GLAPI *p_glGetVkProcAddrNV)( const GLchar *name );
GLVULKANPROCNV (WINE_GLAPI *p_glGetVkProcAddrNV)( const GLchar *name );
void (WINE_GLAPI *p_glGetnColorTable)( GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table );
void (WINE_GLAPI *p_glGetnColorTableARB)( GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table );
void (WINE_GLAPI *p_glGetnCompressedTexImage)( GLenum target, GLint lod, GLsizei bufSize, void *pixels );
......@@ -1769,7 +1769,7 @@ struct opengl_funcs
void (WINE_GLAPI *p_glNamedBufferPageCommitmentEXT)( GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit );
void (WINE_GLAPI *p_glNamedBufferStorage)( GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags );
void (WINE_GLAPI *p_glNamedBufferStorageEXT)( GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags );
void (WINE_GLAPI *p_glNamedBufferStorageExternalEXT)( GLuint buffer, GLintptr offset, GLsizeiptr size, void * clientBuffer, GLbitfield flags );
void (WINE_GLAPI *p_glNamedBufferStorageExternalEXT)( GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags );
void (WINE_GLAPI *p_glNamedBufferStorageMemEXT)( GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset );
void (WINE_GLAPI *p_glNamedBufferSubData)( GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data );
void (WINE_GLAPI *p_glNamedBufferSubDataEXT)( GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data );
......
include/wine/wglext.h
View file @ bbb71620
......@@ -431,34 +431,6 @@ extern "C" {
/*************************************************************/
#ifndef WGL_ARB_pbuffer
DECLARE_HANDLE(HPBUFFERARB);
#endif
#ifndef WGL_EXT_pbuffer
DECLARE_HANDLE(HPBUFFEREXT);
#endif
#ifndef WGL_NV_present_video
DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
#endif
#ifndef WGL_NV_video_output
DECLARE_HANDLE(HPVIDEODEV);
#endif
#ifndef WGL_NV_gpu_affinity
DECLARE_HANDLE(HPGPUNV);
DECLARE_HANDLE(HGPUNV);
typedef struct _GPU_DEVICE {
DWORD cb;
CHAR DeviceName[32];
CHAR DeviceString[128];
DWORD Flags;
RECT rcVirtualScreen;
} GPU_DEVICE, *PGPU_DEVICE;
#endif
#ifndef WGL_NV_video_capture
DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
#endif
#ifndef WGL_ARB_buffer_region
#define WGL_ARB_buffer_region 1
#ifdef WGL_WGLEXT_PROTOTYPES
......
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