summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@chown.ath.cx>2014-03-02 12:57:04 +0100
committerChristian König <christian.koenig@amd.com>2014-03-03 18:37:59 +0100
commit070036ca399d88293ef51b40e859c06acf0c7606 (patch)
tree69ad2e0e749cd79e45d31c5a40bd719ffc9c1f35 /src/mesa
parent86c06871a282ec60e81d0cbabc3b1d661bc33c75 (diff)
downloadexternal_mesa3d-070036ca399d88293ef51b40e859c06acf0c7606.zip
external_mesa3d-070036ca399d88293ef51b40e859c06acf0c7606.tar.gz
external_mesa3d-070036ca399d88293ef51b40e859c06acf0c7606.tar.bz2
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>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/vdpau.c9
-rw-r--r--src/mesa/main/vdpau.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/main/vdpau.c b/src/mesa/main/vdpau.c
index 3597576..c2cf206 100644
--- a/src/mesa/main/vdpau.c
+++ b/src/mesa/main/vdpau.c
@@ -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
diff --git a/src/mesa/main/vdpau.h b/src/mesa/main/vdpau.h
index f32d6da..627609c 100644
--- a/src/mesa/main/vdpau.h
+++ b/src/mesa/main/vdpau.h
@@ -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