From bd4dbdfa519362f74263a2c277a3b4be841acd06 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 16 Apr 2015 15:27:41 -0600 Subject: [PATCH] mesa: add check for NV_texture_barrier in _mesa_TextureBarrierNV() If an app called glTextureBarrierNV() without checking if the extension was available, we'd crash with some gallium drivers in st_TextureBarrier() because the pipe_context::texture_barrier() pointer was NULL. Generate GL_INVALID_OPERATION instead. Reviewed-by: Ilia Mirkin Reviewed-by: Anuj Phogat --- src/mesa/main/texturebarrier.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/main/texturebarrier.c b/src/mesa/main/texturebarrier.c index 08ff561504c..d879eed57f2 100644 --- a/src/mesa/main/texturebarrier.c +++ b/src/mesa/main/texturebarrier.c @@ -49,5 +49,11 @@ _mesa_TextureBarrierNV(void) { GET_CURRENT_CONTEXT(ctx); + if (!ctx->Extensions.NV_texture_barrier) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTextureBarrier(not supported)"); + return; + } + ctx->Driver.TextureBarrier(ctx); } -- 2.30.2