From 0a20e43ff07af237c7254594a98b78eb3e67097d Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 19 Jul 2017 12:28:21 +0200 Subject: [PATCH] mesa: add KHR_no_error support to glFramebufferRenderbuffer() Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/mapi/glapi/gen/ARB_framebuffer_object.xml | 2 +- src/mesa/main/fbobject.c | 22 +++++++++++++++++++ src/mesa/main/fbobject.h | 5 +++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml index 380d4954e64..bd0793c8ece 100644 --- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -255,7 +255,7 @@ - + diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index f93a09e4013..3cf8e011449 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -3731,6 +3731,28 @@ framebuffer_renderbuffer_error(struct gl_context *ctx, renderbuffer, func, false); } +static void +framebuffer_renderbuffer_no_error(struct gl_context *ctx, + struct gl_framebuffer *fb, GLenum attachment, + GLenum renderbuffertarget, + GLuint renderbuffer, const char *func) +{ + framebuffer_renderbuffer(ctx, fb, attachment, renderbuffertarget, + renderbuffer, func, true); +} + +void GLAPIENTRY +_mesa_FramebufferRenderbuffer_no_error(GLenum target, GLenum attachment, + GLenum renderbuffertarget, + GLuint renderbuffer) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_framebuffer *fb = get_framebuffer_target(ctx, target); + framebuffer_renderbuffer_no_error(ctx, fb, attachment, renderbuffertarget, + renderbuffer, "glFramebufferRenderbuffer"); +} + void GLAPIENTRY _mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h index c67785a2850..833ae7da58e 100644 --- a/src/mesa/main/fbobject.h +++ b/src/mesa/main/fbobject.h @@ -280,6 +280,11 @@ extern void GLAPIENTRY _mesa_NamedFramebufferTexture(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); +void GLAPIENTRY +_mesa_FramebufferRenderbuffer_no_error(GLenum target, GLenum attachment, + GLenum renderbuffertarget, + GLuint renderbuffer); + extern void GLAPIENTRY _mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, -- 2.30.2