Re: [Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
On 01.08.2014 06:39, Jason Ekstrand wrote: This adds the API entrypoint, error checking logic, and a driver hook for the ARB_copy_image extension. v2: Fix a typo in ARB_copy_image.xml and add it to the makefile v3: Put ARB_copy_image.xml in the right place alphebetically in the makefile and update the commit message Signed-off-by: Jason Ekstrand jason.ekstr...@intel.com --- src/mapi/glapi/gen/ARB_copy_image.xml | 28 +++ src/mapi/glapi/gen/Makefile.am| 1 + src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/gl_genexec.py | 1 + src/mesa/Makefile.sources | 1 + src/mesa/main/copyimage.c | 341 ++ src/mesa/main/copyimage.h | 49 + src/mesa/main/dd.h| 16 ++ src/mesa/main/extensions.c| 1 + src/mesa/main/mtypes.h| 1 + src/mesa/main/textureview.c | 34 ++-- src/mesa/main/textureview.h | 4 + 12 files changed, 459 insertions(+), 20 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_copy_image.xml create mode 100644 src/mesa/main/copyimage.c create mode 100644 src/mesa/main/copyimage.h diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mapi/glapi/gen/ARB_copy_image.xml new file mode 100644 index 000..2fbd845 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_copy_image.xml @@ -0,0 +1,28 @@ +?xml version=1.0? +!DOCTYPE OpenGLAPI SYSTEM gl_API.dtd + +OpenGLAPI + +category name=GL_ARB_copy_image number=123 + +function name=CopyImageSubData offset=assign +param name=srcName type=GLuint/ +param name=srcTarget type=GLenum/ +param name=srcLevel type=GLint/ +param name=srcX type=GLint/ +param name=srcY type=GLint/ +param name=srcZ type=GLint/ +param name=dstName type=GLuint/ +param name=dstTarget type=GLenum/ +param name=dstLevel type=GLint/ +param name=dstX type=GLint/ +param name=dstY type=GLint/ +param name=dstZ type=GLint/ +param name=srcWidth type=GLsizei/ +param name=srcHeight type=GLsizei/ +param name=srcDepth type=GLsizei/ +/function + +/category + +/OpenGLAPI diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 212731f..645def4 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -117,6 +117,7 @@ API_XML = \ ARB_compressed_texture_pixel_storage.xml \ ARB_compute_shader.xml \ ARB_copy_buffer.xml \ + ARB_copy_image.xml \ ARB_debug_output.xml \ ARB_depth_buffer_float.xml \ ARB_depth_clamp.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e011509..619717d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8302,7 +8302,7 @@ xi:include href=ARB_compute_shader.xml xmlns:xi=http://www.w3.org/2001/XInclude/ -!-- ARB extension #123 -- +xi:include href=ARB_copy_image.xml xmlns:xi=http://www.w3.org/2001/XInclude/ xi:include href=ARB_texture_view.xml xmlns:xi=http://www.w3.org/2001/XInclude/ diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 4609193..d479e66 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -62,6 +62,7 @@ header = /** #include main/condrender.h #include main/context.h #include main/convolve.h +#include main/copyimage.h #include main/depth.h #include main/dlist.h #include main/drawpix.h diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index f4904fb..037cc83 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -28,6 +28,7 @@ MAIN_FILES = \ $(SRCDIR)main/condrender.c \ $(SRCDIR)main/context.c \ $(SRCDIR)main/convolve.c \ + $(SRCDIR)main/copyimage.c \ $(SRCDIR)main/cpuinfo.c \ $(SRCDIR)main/debug.c \ $(SRCDIR)main/depth.c \ diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c new file mode 100644 index 000..96435f3 --- /dev/null +++ b/src/mesa/main/copyimage.c @@ -0,0 +1,341 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 2014 Intel Corporation. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED
Re: [Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
There is one line that is 116 characters long (!) but apart from that: Reviewed-by: Neil Roberts n...@linux.intel.com Regards, - Neil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
On Fri, Aug 1, 2014 at 2:56 AM, Juha-Pekka Heikkila juhapekka.heikk...@gmail.com wrote: On 01.08.2014 06:39, Jason Ekstrand wrote: This adds the API entrypoint, error checking logic, and a driver hook for the ARB_copy_image extension. v2: Fix a typo in ARB_copy_image.xml and add it to the makefile v3: Put ARB_copy_image.xml in the right place alphebetically in the makefile and update the commit message Signed-off-by: Jason Ekstrand jason.ekstr...@intel.com --- src/mapi/glapi/gen/ARB_copy_image.xml | 28 +++ src/mapi/glapi/gen/Makefile.am| 1 + src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/gl_genexec.py | 1 + src/mesa/Makefile.sources | 1 + src/mesa/main/copyimage.c | 341 ++ src/mesa/main/copyimage.h | 49 + src/mesa/main/dd.h| 16 ++ src/mesa/main/extensions.c| 1 + src/mesa/main/mtypes.h| 1 + src/mesa/main/textureview.c | 34 ++-- src/mesa/main/textureview.h | 4 + 12 files changed, 459 insertions(+), 20 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_copy_image.xml create mode 100644 src/mesa/main/copyimage.c create mode 100644 src/mesa/main/copyimage.h diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mapi/glapi/gen/ARB_copy_image.xml new file mode 100644 index 000..2fbd845 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_copy_image.xml @@ -0,0 +1,28 @@ +?xml version=1.0? +!DOCTYPE OpenGLAPI SYSTEM gl_API.dtd + +OpenGLAPI + +category name=GL_ARB_copy_image number=123 + +function name=CopyImageSubData offset=assign +param name=srcName type=GLuint/ +param name=srcTarget type=GLenum/ +param name=srcLevel type=GLint/ +param name=srcX type=GLint/ +param name=srcY type=GLint/ +param name=srcZ type=GLint/ +param name=dstName type=GLuint/ +param name=dstTarget type=GLenum/ +param name=dstLevel type=GLint/ +param name=dstX type=GLint/ +param name=dstY type=GLint/ +param name=dstZ type=GLint/ +param name=srcWidth type=GLsizei/ +param name=srcHeight type=GLsizei/ +param name=srcDepth type=GLsizei/ +/function + +/category + +/OpenGLAPI diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 212731f..645def4 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -117,6 +117,7 @@ API_XML = \ ARB_compressed_texture_pixel_storage.xml \ ARB_compute_shader.xml \ ARB_copy_buffer.xml \ + ARB_copy_image.xml \ ARB_debug_output.xml \ ARB_depth_buffer_float.xml \ ARB_depth_clamp.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e011509..619717d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8302,7 +8302,7 @@ xi:include href=ARB_compute_shader.xml xmlns:xi= http://www.w3.org/2001/XInclude/ -!-- ARB extension #123 -- +xi:include href=ARB_copy_image.xml xmlns:xi= http://www.w3.org/2001/XInclude/ xi:include href=ARB_texture_view.xml xmlns:xi= http://www.w3.org/2001/XInclude/ diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 4609193..d479e66 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -62,6 +62,7 @@ header = /** #include main/condrender.h #include main/context.h #include main/convolve.h +#include main/copyimage.h #include main/depth.h #include main/dlist.h #include main/drawpix.h diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index f4904fb..037cc83 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -28,6 +28,7 @@ MAIN_FILES = \ $(SRCDIR)main/condrender.c \ $(SRCDIR)main/context.c \ $(SRCDIR)main/convolve.c \ + $(SRCDIR)main/copyimage.c \ $(SRCDIR)main/cpuinfo.c \ $(SRCDIR)main/debug.c \ $(SRCDIR)main/depth.c \ diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c new file mode 100644 index 000..96435f3 --- /dev/null +++ b/src/mesa/main/copyimage.c @@ -0,0 +1,341 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 2014 Intel Corporation. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject
[Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
This adds the API entrypoint, error checking logic, and a driver hook for the ARB_copy_image extension. Signed-off-by: Jason Ekstrand jason.ekstr...@intel.com --- src/mapi/glapi/gen/ARB_copy_image.xml | 28 +++ src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/gl_genexec.py | 1 + src/mesa/Makefile.sources | 1 + src/mesa/main/copyimage.c | 341 ++ src/mesa/main/copyimage.h | 49 + src/mesa/main/dd.h| 16 ++ src/mesa/main/extensions.c| 1 + src/mesa/main/mtypes.h| 1 + src/mesa/main/textureview.c | 34 ++-- src/mesa/main/textureview.h | 4 + 11 files changed, 458 insertions(+), 20 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_copy_image.xml create mode 100644 src/mesa/main/copyimage.c create mode 100644 src/mesa/main/copyimage.h diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mapi/glapi/gen/ARB_copy_image.xml new file mode 100644 index 000..64ad0a5 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_copy_image.xml @@ -0,0 +1,28 @@ +?xml version=1.0? +!DOCTYPE OpenGLAPI SYSTEM gl_API.dtd + +OpenGLAPI + +category name=GL_ARB_copy_texture number=123 + +function name=CopyImageSubData offset=assign +param name=srcName type=GLuint/ +param name=srcTarget type=GLenum/ +param name=srcLevel type=GLint/ +param name=srcX type=GLint/ +param name=srcY type=GLint/ +param name=srcZ type=GLint/ +param name=dstName type=GLuint/ +param name=dstTarget type=GLenum/ +param name=dstLevel type=GLint/ +param name=dstX type=GLint/ +param name=dstY type=GLint/ +param name=dstZ type=GLint/ +param name=srcWidth type=GLsizei/ +param name=srcHeight type=GLsizei/ +param name=srcDepth type=GLsizei/ +/function + +/category + +/OpenGLAPI diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e011509..619717d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8302,7 +8302,7 @@ xi:include href=ARB_compute_shader.xml xmlns:xi=http://www.w3.org/2001/XInclude/ -!-- ARB extension #123 -- +xi:include href=ARB_copy_image.xml xmlns:xi=http://www.w3.org/2001/XInclude/ xi:include href=ARB_texture_view.xml xmlns:xi=http://www.w3.org/2001/XInclude/ diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 4609193..d479e66 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -62,6 +62,7 @@ header = /** #include main/condrender.h #include main/context.h #include main/convolve.h +#include main/copyimage.h #include main/depth.h #include main/dlist.h #include main/drawpix.h diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index f4904fb..037cc83 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -28,6 +28,7 @@ MAIN_FILES = \ $(SRCDIR)main/condrender.c \ $(SRCDIR)main/context.c \ $(SRCDIR)main/convolve.c \ + $(SRCDIR)main/copyimage.c \ $(SRCDIR)main/cpuinfo.c \ $(SRCDIR)main/debug.c \ $(SRCDIR)main/depth.c \ diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c new file mode 100644 index 000..96435f3 --- /dev/null +++ b/src/mesa/main/copyimage.c @@ -0,0 +1,341 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 2014 Intel Corporation. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Authors: + *Jason Ekstrand jason.ekstr...@intel.com + */ + +#include glheader.h +#include errors.h +#include enums.h +#include copyimage.h +#include teximage.h +#include texobj.h +#include fbobject.h +#include textureview.h + +static bool +prepare_target(struct gl_context *ctx, GLuint name, GLenum *target, int level, + struct
Re: [Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
On Thu, Jul 31, 2014 at 2:27 PM, Jason Ekstrand ja...@jlekstrand.net wrote: This adds the API entrypoint, error checking logic, and a driver hook for the ARB_copy_image extension. Signed-off-by: Jason Ekstrand jason.ekstr...@intel.com --- src/mapi/glapi/gen/ARB_copy_image.xml | 28 +++ src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/gl_genexec.py | 1 + src/mesa/Makefile.sources | 1 + src/mesa/main/copyimage.c | 341 ++ src/mesa/main/copyimage.h | 49 + src/mesa/main/dd.h| 16 ++ src/mesa/main/extensions.c| 1 + src/mesa/main/mtypes.h| 1 + src/mesa/main/textureview.c | 34 ++-- src/mesa/main/textureview.h | 4 + 11 files changed, 458 insertions(+), 20 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_copy_image.xml create mode 100644 src/mesa/main/copyimage.c create mode 100644 src/mesa/main/copyimage.h diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mapi/glapi/gen/ARB_copy_image.xml new file mode 100644 index 000..64ad0a5 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_copy_image.xml @@ -0,0 +1,28 @@ +?xml version=1.0? +!DOCTYPE OpenGLAPI SYSTEM gl_API.dtd + +OpenGLAPI + +category name=GL_ARB_copy_texture number=123 copy_image, of course? Also you need to add this file to the API_XML list in src/mapi/glapi/gen/Makefile.am ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
On Thu, Jul 31, 2014 at 11:38 AM, Ilia Mirkin imir...@alum.mit.edu wrote: On Thu, Jul 31, 2014 at 2:27 PM, Jason Ekstrand ja...@jlekstrand.net wrote: This adds the API entrypoint, error checking logic, and a driver hook for the ARB_copy_image extension. Signed-off-by: Jason Ekstrand jason.ekstr...@intel.com --- src/mapi/glapi/gen/ARB_copy_image.xml | 28 +++ src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/gl_genexec.py | 1 + src/mesa/Makefile.sources | 1 + src/mesa/main/copyimage.c | 341 ++ src/mesa/main/copyimage.h | 49 + src/mesa/main/dd.h| 16 ++ src/mesa/main/extensions.c| 1 + src/mesa/main/mtypes.h| 1 + src/mesa/main/textureview.c | 34 ++-- src/mesa/main/textureview.h | 4 + 11 files changed, 458 insertions(+), 20 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_copy_image.xml create mode 100644 src/mesa/main/copyimage.c create mode 100644 src/mesa/main/copyimage.h diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mapi/glapi/gen/ARB_copy_image.xml new file mode 100644 index 000..64ad0a5 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_copy_image.xml @@ -0,0 +1,28 @@ +?xml version=1.0? +!DOCTYPE OpenGLAPI SYSTEM gl_API.dtd + +OpenGLAPI + +category name=GL_ARB_copy_texture number=123 copy_image, of course? Also you need to add this file to the API_XML list in src/mapi/glapi/gen/Makefile.am Thanks, Ilia. Fixed; sending a v2. --Jason Ekstrand ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
This adds the API entrypoint, error checking logic, and a driver hook for the ARB_copy_image extension. v2: Fix a typo in ARB_copy_image.xml and add it to the makefile Signed-off-by: Jason Ekstrand jason.ekstr...@intel.com --- src/mapi/glapi/gen/ARB_copy_image.xml | 28 +++ src/mapi/glapi/gen/Makefile.am| 1 + src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/gl_genexec.py | 1 + src/mesa/Makefile.sources | 1 + src/mesa/main/copyimage.c | 341 ++ src/mesa/main/copyimage.h | 49 + src/mesa/main/dd.h| 16 ++ src/mesa/main/extensions.c| 1 + src/mesa/main/mtypes.h| 1 + src/mesa/main/textureview.c | 34 ++-- src/mesa/main/textureview.h | 4 + 12 files changed, 459 insertions(+), 20 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_copy_image.xml create mode 100644 src/mesa/main/copyimage.c create mode 100644 src/mesa/main/copyimage.h diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mapi/glapi/gen/ARB_copy_image.xml new file mode 100644 index 000..2fbd845 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_copy_image.xml @@ -0,0 +1,28 @@ +?xml version=1.0? +!DOCTYPE OpenGLAPI SYSTEM gl_API.dtd + +OpenGLAPI + +category name=GL_ARB_copy_image number=123 + +function name=CopyImageSubData offset=assign +param name=srcName type=GLuint/ +param name=srcTarget type=GLenum/ +param name=srcLevel type=GLint/ +param name=srcX type=GLint/ +param name=srcY type=GLint/ +param name=srcZ type=GLint/ +param name=dstName type=GLuint/ +param name=dstTarget type=GLenum/ +param name=dstLevel type=GLint/ +param name=dstX type=GLint/ +param name=dstY type=GLint/ +param name=dstZ type=GLint/ +param name=srcWidth type=GLsizei/ +param name=srcHeight type=GLsizei/ +param name=srcDepth type=GLsizei/ +/function + +/category + +/OpenGLAPI diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 212731f..f0bf34a 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -114,6 +114,7 @@ API_XML = \ ARB_clear_buffer_object.xml \ ARB_clear_texture.xml \ ARB_color_buffer_float.xml \ + ARB_copy_image.xml \ ARB_compressed_texture_pixel_storage.xml \ ARB_compute_shader.xml \ ARB_copy_buffer.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e011509..619717d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8302,7 +8302,7 @@ xi:include href=ARB_compute_shader.xml xmlns:xi=http://www.w3.org/2001/XInclude/ -!-- ARB extension #123 -- +xi:include href=ARB_copy_image.xml xmlns:xi=http://www.w3.org/2001/XInclude/ xi:include href=ARB_texture_view.xml xmlns:xi=http://www.w3.org/2001/XInclude/ diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 4609193..d479e66 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -62,6 +62,7 @@ header = /** #include main/condrender.h #include main/context.h #include main/convolve.h +#include main/copyimage.h #include main/depth.h #include main/dlist.h #include main/drawpix.h diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index f4904fb..037cc83 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -28,6 +28,7 @@ MAIN_FILES = \ $(SRCDIR)main/condrender.c \ $(SRCDIR)main/context.c \ $(SRCDIR)main/convolve.c \ + $(SRCDIR)main/copyimage.c \ $(SRCDIR)main/cpuinfo.c \ $(SRCDIR)main/debug.c \ $(SRCDIR)main/depth.c \ diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c new file mode 100644 index 000..96435f3 --- /dev/null +++ b/src/mesa/main/copyimage.c @@ -0,0 +1,341 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 2014 Intel Corporation. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
Re: [Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
On Thu, Jul 31, 2014 at 4:47 PM, Jason Ekstrand ja...@jlekstrand.net wrote: diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 212731f..f0bf34a 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -114,6 +114,7 @@ API_XML = \ ARB_clear_buffer_object.xml \ ARB_clear_texture.xml \ ARB_color_buffer_float.xml \ + ARB_copy_image.xml \ ARB_compressed_texture_pixel_storage.xml \ ARB_compute_shader.xml \ ARB_copy_buffer.xml \ The list is alphabetical. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
Hi Jason, The prefix of the commit message should be mesa: , because it modifies mesa/main. Marek On Fri, Aug 1, 2014 at 1:47 AM, Jason Ekstrand ja...@jlekstrand.net wrote: This adds the API entrypoint, error checking logic, and a driver hook for the ARB_copy_image extension. v2: Fix a typo in ARB_copy_image.xml and add it to the makefile Signed-off-by: Jason Ekstrand jason.ekstr...@intel.com --- src/mapi/glapi/gen/ARB_copy_image.xml | 28 +++ src/mapi/glapi/gen/Makefile.am| 1 + src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/gl_genexec.py | 1 + src/mesa/Makefile.sources | 1 + src/mesa/main/copyimage.c | 341 ++ src/mesa/main/copyimage.h | 49 + src/mesa/main/dd.h| 16 ++ src/mesa/main/extensions.c| 1 + src/mesa/main/mtypes.h| 1 + src/mesa/main/textureview.c | 34 ++-- src/mesa/main/textureview.h | 4 + 12 files changed, 459 insertions(+), 20 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_copy_image.xml create mode 100644 src/mesa/main/copyimage.c create mode 100644 src/mesa/main/copyimage.h diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mapi/glapi/gen/ARB_copy_image.xml new file mode 100644 index 000..2fbd845 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_copy_image.xml @@ -0,0 +1,28 @@ +?xml version=1.0? +!DOCTYPE OpenGLAPI SYSTEM gl_API.dtd + +OpenGLAPI + +category name=GL_ARB_copy_image number=123 + +function name=CopyImageSubData offset=assign +param name=srcName type=GLuint/ +param name=srcTarget type=GLenum/ +param name=srcLevel type=GLint/ +param name=srcX type=GLint/ +param name=srcY type=GLint/ +param name=srcZ type=GLint/ +param name=dstName type=GLuint/ +param name=dstTarget type=GLenum/ +param name=dstLevel type=GLint/ +param name=dstX type=GLint/ +param name=dstY type=GLint/ +param name=dstZ type=GLint/ +param name=srcWidth type=GLsizei/ +param name=srcHeight type=GLsizei/ +param name=srcDepth type=GLsizei/ +/function + +/category + +/OpenGLAPI diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 212731f..f0bf34a 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -114,6 +114,7 @@ API_XML = \ ARB_clear_buffer_object.xml \ ARB_clear_texture.xml \ ARB_color_buffer_float.xml \ + ARB_copy_image.xml \ ARB_compressed_texture_pixel_storage.xml \ ARB_compute_shader.xml \ ARB_copy_buffer.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e011509..619717d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8302,7 +8302,7 @@ xi:include href=ARB_compute_shader.xml xmlns:xi=http://www.w3.org/2001/XInclude/ -!-- ARB extension #123 -- +xi:include href=ARB_copy_image.xml xmlns:xi=http://www.w3.org/2001/XInclude/ xi:include href=ARB_texture_view.xml xmlns:xi=http://www.w3.org/2001/XInclude/ diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 4609193..d479e66 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -62,6 +62,7 @@ header = /** #include main/condrender.h #include main/context.h #include main/convolve.h +#include main/copyimage.h #include main/depth.h #include main/dlist.h #include main/drawpix.h diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index f4904fb..037cc83 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -28,6 +28,7 @@ MAIN_FILES = \ $(SRCDIR)main/condrender.c \ $(SRCDIR)main/context.c \ $(SRCDIR)main/convolve.c \ + $(SRCDIR)main/copyimage.c \ $(SRCDIR)main/cpuinfo.c \ $(SRCDIR)main/debug.c \ $(SRCDIR)main/depth.c \ diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c new file mode 100644 index 000..96435f3 --- /dev/null +++ b/src/mesa/main/copyimage.c @@ -0,0 +1,341 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 2014 Intel Corporation. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of
[Mesa-dev] [PATCH 1/5] Add GL API support for ARB_copy_image
This adds the API entrypoint, error checking logic, and a driver hook for the ARB_copy_image extension. v2: Fix a typo in ARB_copy_image.xml and add it to the makefile v3: Put ARB_copy_image.xml in the right place alphebetically in the makefile and update the commit message Signed-off-by: Jason Ekstrand jason.ekstr...@intel.com --- src/mapi/glapi/gen/ARB_copy_image.xml | 28 +++ src/mapi/glapi/gen/Makefile.am| 1 + src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/gl_genexec.py | 1 + src/mesa/Makefile.sources | 1 + src/mesa/main/copyimage.c | 341 ++ src/mesa/main/copyimage.h | 49 + src/mesa/main/dd.h| 16 ++ src/mesa/main/extensions.c| 1 + src/mesa/main/mtypes.h| 1 + src/mesa/main/textureview.c | 34 ++-- src/mesa/main/textureview.h | 4 + 12 files changed, 459 insertions(+), 20 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_copy_image.xml create mode 100644 src/mesa/main/copyimage.c create mode 100644 src/mesa/main/copyimage.h diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mapi/glapi/gen/ARB_copy_image.xml new file mode 100644 index 000..2fbd845 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_copy_image.xml @@ -0,0 +1,28 @@ +?xml version=1.0? +!DOCTYPE OpenGLAPI SYSTEM gl_API.dtd + +OpenGLAPI + +category name=GL_ARB_copy_image number=123 + +function name=CopyImageSubData offset=assign +param name=srcName type=GLuint/ +param name=srcTarget type=GLenum/ +param name=srcLevel type=GLint/ +param name=srcX type=GLint/ +param name=srcY type=GLint/ +param name=srcZ type=GLint/ +param name=dstName type=GLuint/ +param name=dstTarget type=GLenum/ +param name=dstLevel type=GLint/ +param name=dstX type=GLint/ +param name=dstY type=GLint/ +param name=dstZ type=GLint/ +param name=srcWidth type=GLsizei/ +param name=srcHeight type=GLsizei/ +param name=srcDepth type=GLsizei/ +/function + +/category + +/OpenGLAPI diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 212731f..645def4 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -117,6 +117,7 @@ API_XML = \ ARB_compressed_texture_pixel_storage.xml \ ARB_compute_shader.xml \ ARB_copy_buffer.xml \ + ARB_copy_image.xml \ ARB_debug_output.xml \ ARB_depth_buffer_float.xml \ ARB_depth_clamp.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e011509..619717d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8302,7 +8302,7 @@ xi:include href=ARB_compute_shader.xml xmlns:xi=http://www.w3.org/2001/XInclude/ -!-- ARB extension #123 -- +xi:include href=ARB_copy_image.xml xmlns:xi=http://www.w3.org/2001/XInclude/ xi:include href=ARB_texture_view.xml xmlns:xi=http://www.w3.org/2001/XInclude/ diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 4609193..d479e66 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -62,6 +62,7 @@ header = /** #include main/condrender.h #include main/context.h #include main/convolve.h +#include main/copyimage.h #include main/depth.h #include main/dlist.h #include main/drawpix.h diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index f4904fb..037cc83 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -28,6 +28,7 @@ MAIN_FILES = \ $(SRCDIR)main/condrender.c \ $(SRCDIR)main/context.c \ $(SRCDIR)main/convolve.c \ + $(SRCDIR)main/copyimage.c \ $(SRCDIR)main/cpuinfo.c \ $(SRCDIR)main/debug.c \ $(SRCDIR)main/depth.c \ diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c new file mode 100644 index 000..96435f3 --- /dev/null +++ b/src/mesa/main/copyimage.c @@ -0,0 +1,341 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 2014 Intel Corporation. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR
