These are Reviewed-by: Chris Forbes <chr...@ijw.co.nz>
On Fri, Jul 25, 2014 at 11:04 AM, Jordan Justen <jljus...@gmail.com> wrote: > On Thu, Jul 24, 2014 at 3:56 PM, Ilia Mirkin <imir...@alum.mit.edu> wrote: >> On Thu, Jul 24, 2014 at 6:44 PM, Jordan Justen >> <jordan.l.jus...@intel.com> wrote: >>> This fixes piglit's arb_compute_shader-minmax test. >>> >>> Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> >>> --- >>> Re-send (originally sent June 9) >> >> Is there any point in making these Const.Foo so that individual >> drivers can specify different values? Or would all drivers always just >> want these values? > > Yes, I think some will want to become driver configurable. But, I > figured they should start as constant and be converted as needed. > > -Jordan > >>> >>> src/mesa/main/config.h | 11 +++++++++++ >>> src/mesa/main/get_hash_params.py | 7 +++++++ >>> 2 files changed, 18 insertions(+) >>> >>> diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h >>> index c96502a..4ec4b75 100644 >>> --- a/src/mesa/main/config.h >>> +++ b/src/mesa/main/config.h >>> @@ -289,6 +289,17 @@ >>> #define PERFQUERY_HAVE_GPA_EXTENDED_COUNTERS 0 >>> /*@}*/ >>> >>> +/** For GL_ARB_compute_shader */ >>> +/*@{*/ >>> +#define MAX_COMPUTE_UNIFORM_BLOCKS 12 >>> +#define MAX_COMPUTE_TEXTURE_IMAGE_UNITS 16 >>> +#define MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 8 >>> +#define MAX_COMPUTE_ATOMIC_COUNTERS 8 >>> +#define MAX_COMPUTE_SHARED_MEMORY_SIZE 32768 >>> +#define MAX_COMPUTE_UNIFORM_COMPONENTS 512 >>> +#define MAX_COMPUTE_IMAGE_UNIFORMS 8 >>> +/*@}*/ >>> + >>> /* >>> * Color channel component order >>> * >>> diff --git a/src/mesa/main/get_hash_params.py >>> b/src/mesa/main/get_hash_params.py >>> index d45962d..35d6172 100644 >>> --- a/src/mesa/main/get_hash_params.py >>> +++ b/src/mesa/main/get_hash_params.py >>> @@ -774,6 +774,13 @@ descriptor=[ >>> >>> # GL_ARB_compute_shader >>> [ "MAX_COMPUTE_WORK_GROUP_INVOCATIONS", >>> "CONTEXT_INT(Const.MaxComputeWorkGroupInvocations), >>> extra_ARB_compute_shader" ], >>> + [ "MAX_COMPUTE_UNIFORM_BLOCKS", "CONST(MAX_COMPUTE_UNIFORM_BLOCKS), >>> extra_ARB_compute_shader" ], >>> + [ "MAX_COMPUTE_TEXTURE_IMAGE_UNITS", >>> "CONST(MAX_COMPUTE_TEXTURE_IMAGE_UNITS), extra_ARB_compute_shader" ], >>> + [ "MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS", >>> "CONST(MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS), extra_ARB_compute_shader" ], >>> + [ "MAX_COMPUTE_ATOMIC_COUNTERS", "CONST(MAX_COMPUTE_ATOMIC_COUNTERS), >>> extra_ARB_compute_shader" ], >>> + [ "MAX_COMPUTE_SHARED_MEMORY_SIZE", >>> "CONST(MAX_COMPUTE_SHARED_MEMORY_SIZE), extra_ARB_compute_shader" ], >>> + [ "MAX_COMPUTE_UNIFORM_COMPONENTS", >>> "CONST(MAX_COMPUTE_UNIFORM_COMPONENTS), extra_ARB_compute_shader" ], >>> + [ "MAX_COMPUTE_IMAGE_UNIFORMS", "CONST(MAX_COMPUTE_IMAGE_UNIFORMS), >>> extra_ARB_compute_shader" ], >>> >>> # GL_ARB_gpu_shader5 >>> [ "MAX_GEOMETRY_SHADER_INVOCATIONS", >>> "CONST(MAX_GEOMETRY_SHADER_INVOCATIONS), extra_ARB_gpu_shader5" ], >>> -- >>> 2.0.1 >>> >>> _______________________________________________ >>> mesa-dev mailing list >>> mesa-dev@lists.freedesktop.org >>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev >> _______________________________________________ >> mesa-dev mailing list >> mesa-dev@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/mesa-dev > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev