Module: Mesa Branch: master Commit: c244c25ce36f6920c25c8fd8f071038712004f14 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c244c25ce36f6920c25c8fd8f071038712004f14
Author: Samuel Pitoiset <[email protected]> Date: Thu Jun 22 15:51:46 2017 +0200 mesa: add KHR_no_error support for glViewport() Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> --- src/mapi/glapi/gen/gl_API.xml | 2 +- src/mesa/main/viewport.c | 7 +++++++ src/mesa/main/viewport.h | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 8784f0537f..2cc66ac8b0 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -2966,7 +2966,7 @@ <glx rop="190"/> </function> - <function name="Viewport" es1="1.0" es2="2.0"> + <function name="Viewport" es1="1.0" es2="2.0" no_error="true"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c index b18168a4d4..8c95bf472d 100644 --- a/src/mesa/main/viewport.c +++ b/src/mesa/main/viewport.c @@ -119,6 +119,13 @@ viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei width, * parameters. */ void GLAPIENTRY +_mesa_Viewport_no_error(GLint x, GLint y, GLsizei width, GLsizei height) +{ + GET_CURRENT_CONTEXT(ctx); + viewport(ctx, x, y, width, height); +} + +void GLAPIENTRY _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h index 570a23a23b..b07410bf58 100644 --- a/src/mesa/main/viewport.h +++ b/src/mesa/main/viewport.h @@ -31,6 +31,9 @@ struct gl_context; +void GLAPIENTRY +_mesa_Viewport_no_error(GLint x, GLint y, GLsizei width, GLsizei height); + extern void GLAPIENTRY _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
