OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osmesa: Make osmesa.h compatible with Windows SDK's GL.h

Browse Source 
For glext.h and glcorearb.h, it's already use 'APIENTRY', so for the osmesa.h

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26561>
This commit is contained in:
Yonggang Luo
2023-10-31 04:55:16 +08:00
committed by Marge Bot
parent 10db6948da
commit 5bf68ab701
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/GL/osmesa.h
View File

@@ -121,7 +121,7 @@ typedef struct osmesa_context *OSMesaContext;
* display lists. NULL indicates no sharing. * display lists. NULL indicates no sharing.
* Return: an OSMesaContext or 0 if error * Return: an OSMesaContext or 0 if error
*/ */
GLAPI OSMesaContext GLAPIENTRY GLAPI OSMesaContext APIENTRY
OSMesaCreateContext( GLenum format, OSMesaContext sharelist ); OSMesaCreateContext( GLenum format, OSMesaContext sharelist );
@@ -134,7 +134,7 @@ OSMesaCreateContext( GLenum format, OSMesaContext sharelist );
* *
* New in Mesa 3.5 * New in Mesa 3.5
*/ */
GLAPI OSMesaContext GLAPIENTRY GLAPI OSMesaContext APIENTRY
OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits, OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
GLint accumBits, OSMesaContext sharelist); GLint accumBits, OSMesaContext sharelist);
@@ -163,7 +163,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
* *
* New in Mesa 11.2 * New in Mesa 11.2
*/ */
GLAPI OSMesaContext GLAPIENTRY GLAPI OSMesaContext APIENTRY
OSMesaCreateContextAttribs( const int *attribList, OSMesaContext sharelist ); OSMesaCreateContextAttribs( const int *attribList, OSMesaContext sharelist );
@@ -173,7 +173,7 @@ OSMesaCreateContextAttribs( const int *attribList, OSMesaContext sharelist );
* *
* Input: ctx - the context to destroy * Input: ctx - the context to destroy
*/ */
GLAPI void GLAPIENTRY GLAPI void APIENTRY
OSMesaDestroyContext( OSMesaContext ctx ); OSMesaDestroyContext( OSMesaContext ctx );
@@ -205,7 +205,7 @@ OSMesaDestroyContext( OSMesaContext ctx );
* invalid buffer address, type!=GL_UNSIGNED_BYTE, width<1, height<1, * invalid buffer address, type!=GL_UNSIGNED_BYTE, width<1, height<1,
* width>internal limit or height>internal limit. * width>internal limit or height>internal limit.
*/ */
GLAPI GLboolean GLAPIENTRY GLAPI GLboolean APIENTRY
OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type, OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type,
GLsizei width, GLsizei height ); GLsizei width, GLsizei height );
@@ -215,7 +215,7 @@ OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type,
/* /*
* Return the current Off-Screen Mesa rendering context handle. * Return the current Off-Screen Mesa rendering context handle.
*/ */
GLAPI OSMesaContext GLAPIENTRY GLAPI OSMesaContext APIENTRY
OSMesaGetCurrentContext( void ); OSMesaGetCurrentContext( void );
@@ -233,7 +233,7 @@ OSMesaGetCurrentContext( void );
* *
* New in version 2.0. * New in version 2.0.
*/ */
GLAPI void GLAPIENTRY GLAPI void APIENTRY
OSMesaPixelStore( GLint pname, GLint value ); OSMesaPixelStore( GLint pname, GLint value );
@@ -249,7 +249,7 @@ OSMesaPixelStore( GLint pname, GLint value );
* OSMESA_Y_UP returns 1 or 0 to indicate Y axis direction * OSMESA_Y_UP returns 1 or 0 to indicate Y axis direction
* value - pointer to integer in which to return result. * value - pointer to integer in which to return result.
*/ */
GLAPI void GLAPIENTRY GLAPI void APIENTRY
OSMesaGetIntegerv( GLint pname, GLint *value ); OSMesaGetIntegerv( GLint pname, GLint *value );
@@ -264,7 +264,7 @@ OSMesaGetIntegerv( GLint pname, GLint *value );
* *
* New in Mesa 2.4. * New in Mesa 2.4.
*/ */
GLAPI GLboolean GLAPIENTRY GLAPI GLboolean APIENTRY
OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint *height, OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint *height,
GLint *bytesPerValue, void **buffer ); GLint *bytesPerValue, void **buffer );
@@ -280,7 +280,7 @@ OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint *height,
* *
* New in Mesa 3.3. * New in Mesa 3.3.
*/ */
GLAPI GLboolean GLAPIENTRY GLAPI GLboolean APIENTRY
OSMesaGetColorBuffer( OSMesaContext c, GLint *width, GLint *height, OSMesaGetColorBuffer( OSMesaContext c, GLint *width, GLint *height,
GLint *format, void **buffer ); GLint *format, void **buffer );
@@ -297,7 +297,7 @@ typedef void (*OSMESAproc)();
* New in Mesa 4.1 * New in Mesa 4.1
* Return OSMESAproc in 6.3. * Return OSMESAproc in 6.3.
*/ */
GLAPI OSMESAproc GLAPIENTRY GLAPI OSMESAproc APIENTRY
OSMesaGetProcAddress( const char *funcName ); OSMesaGetProcAddress( const char *funcName );
@@ -306,7 +306,7 @@ OSMesaGetProcAddress( const char *funcName );
* Enable/disable color clamping, off by default. * Enable/disable color clamping, off by default.
* New in Mesa 6.4.2 * New in Mesa 6.4.2
*/ */
GLAPI void GLAPIENTRY GLAPI void APIENTRY
OSMesaColorClamp(GLboolean enable); OSMesaColorClamp(GLboolean enable);
@@ -319,7 +319,7 @@ OSMesaColorClamp(GLboolean enable);
* the filter is enabled, and the value may control the filter's quality. * the filter is enabled, and the value may control the filter's quality.
* New in Mesa 10.0 * New in Mesa 10.0
*/ */
GLAPI void GLAPIENTRY GLAPI void APIENTRY
OSMesaPostprocess(OSMesaContext osmesa, const char *filter, OSMesaPostprocess(OSMesaContext osmesa, const char *filter,
unsigned enable_value); unsigned enable_value);