[Piglit] [PATCH 01/12] glapi: Rename ARB_compute_shader "LOCAL" -> "WORK_GROUP".
Anuj Phogat
anuj.phogat at gmail.com
Wed Jan 22 18:21:51 PST 2014
On Thu, Jan 9, 2014 at 10:59 AM, Paul Berry <stereotype441 at gmail.com> wrote:
> The piglit glapi files, which are derived from files published on
> www.opengl.org, contained nonstandard names for two enums:
> COMPUTE_LOCAL_WORK_SIZE and MAX_COMPUTE_LOCAL_INVOCATIONS.
>
> The ARB_compute_shader spec, the OpenGL specs, and the OpenGL wiki all
> agree that these should be called COMPUTE_WORK_GROUP_SIZE and
> MAX_COMPUTE_WORK_GROUP_INVOCATIONS. So rename them in piglit to be
> consistent.
> ---
> glapi/enum.spec | 4 ++--
> glapi/enumext.spec | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/glapi/enum.spec b/glapi/enum.spec
> index abe64de..c854b91 100644
> --- a/glapi/enum.spec
> +++ b/glapi/enum.spec
> @@ -3592,7 +3592,7 @@ ARB_compute_shader enum:
> MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS = 0x8264
> MAX_COMPUTE_ATOMIC_COUNTERS = 0x8265
> MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 0x8266
> - COMPUTE_LOCAL_WORK_SIZE = 0x8267
> + COMPUTE_WORK_GROUP_SIZE = 0x8267
>
> # Also VERSION_4_3
> KHR_debug enum: (additional; see above)
> @@ -8681,7 +8681,7 @@ ARB_stencil_texturing enum:
>
> # Also VERSION_4_3
> ARB_compute_shader enum:
> - MAX_COMPUTE_LOCAL_INVOCATIONS = 0x90EB
> + MAX_COMPUTE_WORK_GROUP_INVOCATIONS = 0x90EB
> UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC
> ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER = 0x90ED
> DISPATCH_INDIRECT_BUFFER = 0x90EE
> diff --git a/glapi/enumext.spec b/glapi/enumext.spec
> index 044ee6a..c08024f 100644
> --- a/glapi/enumext.spec
> +++ b/glapi/enumext.spec
> @@ -1825,10 +1825,10 @@ passthru: /* Reuse tokens from ARB_compute_shader */
> use ARB_compute_shader MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS
> use ARB_compute_shader MAX_COMPUTE_ATOMIC_COUNTERS
> use ARB_compute_shader MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS
> - use ARB_compute_shader MAX_COMPUTE_LOCAL_INVOCATIONS
> + use ARB_compute_shader MAX_COMPUTE_WORK_GROUP_INVOCATIONS
> use ARB_compute_shader MAX_COMPUTE_WORK_GROUP_COUNT
> use ARB_compute_shader MAX_COMPUTE_WORK_GROUP_SIZE
> - use ARB_compute_shader COMPUTE_LOCAL_WORK_SIZE
> + use ARB_compute_shader COMPUTE_WORK_GROUP_SIZE
> use ARB_compute_shader UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER
> use ARB_compute_shader ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER
> use ARB_compute_shader DISPATCH_INDIRECT_BUFFER
> @@ -3773,10 +3773,10 @@ ARB_compute_shader enum:
> MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS = 0x8264
> MAX_COMPUTE_ATOMIC_COUNTERS = 0x8265
> MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 0x8266
> - MAX_COMPUTE_LOCAL_INVOCATIONS = 0x90EB
> + MAX_COMPUTE_WORK_GROUP_INVOCATIONS = 0x90EB
> MAX_COMPUTE_WORK_GROUP_COUNT = 0x91BE
> MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF
> - COMPUTE_LOCAL_WORK_SIZE = 0x8267
> + COMPUTE_WORK_GROUP_SIZE = 0x8267
> UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC
> ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER = 0x90ED
> DISPATCH_INDIRECT_BUFFER = 0x90EE
> --
> 1.8.5.2
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
This series is: Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
More information about the Piglit
mailing list