NV_vdpau_interop: fix IsSurfaceNV return type
The spec incorrectly used void as return type, when it should have been GLboolean. This has now been fixed. According to Nvidia, their implementation always used GLboolean. Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
committed by
Christian König
parent
86c06871a2
commit
070036ca39
+1
-1
@@ -9658,7 +9658,7 @@ GLAPI void APIENTRY glVDPAUInitNV (const void *vdpDevice, const void *getProcAdd
|
||||
GLAPI void APIENTRY glVDPAUFiniNV (void);
|
||||
GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
|
||||
GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
|
||||
GLAPI void APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface);
|
||||
GLAPI GLboolean APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface);
|
||||
GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface);
|
||||
GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
|
||||
GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access);
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
</function>
|
||||
|
||||
<function name="VDPAUIsSurfaceNV" offset="assign">
|
||||
<return type="GLboolean"/>
|
||||
<param name="surface" type="GLintptr"/>
|
||||
</function>
|
||||
|
||||
|
||||
@@ -205,7 +205,7 @@ _mesa_VDPAURegisterOutputSurfaceNV(const GLvoid *vdpSurface, GLenum target,
|
||||
numTextureNames, textureNames);
|
||||
}
|
||||
|
||||
void GLAPIENTRY
|
||||
GLboolean GLAPIENTRY
|
||||
_mesa_VDPAUIsSurfaceNV(GLintptr surface)
|
||||
{
|
||||
struct vdp_surface *surf = (struct vdp_surface *)surface;
|
||||
@@ -213,13 +213,14 @@ _mesa_VDPAUIsSurfaceNV(GLintptr surface)
|
||||
|
||||
if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUIsSurfaceNV");
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_mesa_set_search(ctx->vdpSurfaces, _mesa_hash_pointer(surf), surf)) {
|
||||
_mesa_error(ctx, GL_INVALID_VALUE, "VDPAUIsSurfaceNV");
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void GLAPIENTRY
|
||||
|
||||
@@ -50,7 +50,7 @@ _mesa_VDPAURegisterOutputSurfaceNV(const GLvoid *vdpSurface, GLenum target,
|
||||
GLsizei numTextureNames,
|
||||
const GLuint *textureNames);
|
||||
|
||||
extern void GLAPIENTRY
|
||||
extern GLboolean GLAPIENTRY
|
||||
_mesa_VDPAUIsSurfaceNV(GLintptr surface);
|
||||
|
||||
extern void GLAPIENTRY
|
||||
|
||||
Reference in New Issue
Block a user