diff options
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 4 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 20 | ||||
| -rw-r--r-- | 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 9857e39e1f2..d878a04ea09 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 1093ea033e6..36747a72732 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -4007,6 +4007,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 c2fd4514d88..04ddbb90e55 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 ); |