OSDN Git Service

glsl: Expose gl_MaxTess{Control,Evaluation}AtomicCounters.
authorMatt Turner <mattst88@gmail.com>
Thu, 24 Sep 2015 01:06:19 +0000 (18:06 -0700)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 28 Sep 2015 19:29:13 +0000 (20:29 +0100)
commitead4ce53f77f75936cd9044d6dc467d533e19bf0
treee47ae75ffcbc569b4d62ee2d8628de8765732fbc
parentdace17bfd4e2c8e72387a0cfe0aabfa9927c50c7
glsl: Expose gl_MaxTess{Control,Evaluation}AtomicCounters.

... with only ARB_shader_atomic_counters.

I expected to see interactions with ARB_tessellation_shader in the
ARB_shader_atomic_counters spec, but they do not exist. It seems that we
should unconditionally expose these variables in the presence of
ARB_shader_atomic_counters:

   gl_MaxTessControlAtomicCounters
   gl_MaxTessEvaluationAtomicCounters

This partially reverts commit da7adb99e8. The commit also affected
gl_MaxTessControlImageUniforms and gl_MaxTessEvaluationImageUniforms
similarly but the ARB_shader_image_load_store spec does list an
interaction with ARB_tessellation_shader.

Cc: "11.0" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92095
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit d6bb46bbe8e4ef90dedc5a04c7434a8113c10a8b)
src/glsl/builtin_variables.cpp