--- src/mapi/glapi/gen/gl_API.xml | 4 ++-- src/mesa/main/teximage.c | 20 ++++++++++++++++++++ src/mesa/main/teximage.h | 11 +++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 9857e39..d878a04 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -3254,7 +3254,7 @@ <glx rop="192"/> </function> - <function name="CopyTexImage1D"> + <function name="CopyTexImage1D" no_error="true"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -3265,7 +3265,7 @@ <glx rop="4119"/> </function> - <function name="CopyTexImage2D" es1="1.0" es2="2.0"> + <function name="CopyTexImage2D" es1="1.0" es2="2.0" no_error="true"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index a08f34b..0cacb89 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -4006,6 +4006,26 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat, } +void GLAPIENTRY +_mesa_CopyTexImage1D_no_error(GLenum target, GLint level, GLenum internalFormat, + GLint x, GLint y, GLsizei width, GLint border) +{ + GET_CURRENT_CONTEXT(ctx); + copyteximage_no_error(ctx, 1, target, level, internalFormat, x, y, width, 1, + border); +} + + +void GLAPIENTRY +_mesa_CopyTexImage2D_no_error(GLenum target, GLint level, GLenum internalFormat, + GLint x, GLint y, GLsizei width, GLsizei height, + GLint border) +{ + GET_CURRENT_CONTEXT(ctx); + copyteximage_no_error(ctx, 2, target, level, internalFormat, + x, y, width, height, border); +} + void GLAPIENTRY _mesa_CopyTexSubImage1D( GLenum target, GLint level, diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index c2fd451..04ddbb9 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -352,6 +352,17 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, extern void GLAPIENTRY +_mesa_CopyTexImage1D_no_error(GLenum target, GLint level, GLenum internalformat, + GLint x, GLint y, GLsizei width, GLint border); + + +extern void GLAPIENTRY +_mesa_CopyTexImage2D_no_error(GLenum target, GLint level, GLenum internalformat, + GLint x, GLint y, GLsizei width, GLsizei height, + GLint border ); + + +extern void GLAPIENTRY _mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width ); -- 2.9.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev