Re: [Mesa-dev] [PATCH 3/7] glsl: expose max atomic counter/buffer consts for tess in ES 3.2

2016-08-31 Thread Ian Romanick
Patches 1 through 3 are

Reviewed-by: Ian Romanick 

On 08/28/2016 07:10 PM, Ilia Mirkin wrote:
> Curiously OES/EXT_tessellation_shader leave these out, while ES 3.2 adds
> them in.
> 
> Signed-off-by: Ilia Mirkin 
> ---
>  src/compiler/glsl/builtin_variables.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/compiler/glsl/builtin_variables.cpp 
> b/src/compiler/glsl/builtin_variables.cpp
> index 036261f..93d8c92 100644
> --- a/src/compiler/glsl/builtin_variables.cpp
> +++ b/src/compiler/glsl/builtin_variables.cpp
> @@ -759,7 +759,7 @@ builtin_variable_generator::generate_constants()
>   add_const("gl_MaxGeometryAtomicCounters",
> state->Const.MaxGeometryAtomicCounters);
>}
> -  if (!state->es_shader) {
> +  if (state->is_version(110, 320)) {
>   add_const("gl_MaxTessControlAtomicCounters",
> state->Const.MaxTessControlAtomicCounters);
>   add_const("gl_MaxTessEvaluationAtomicCounters",
> @@ -781,7 +781,7 @@ builtin_variable_generator::generate_constants()
>   add_const("gl_MaxGeometryAtomicCounterBuffers",
> state->Const.MaxGeometryAtomicCounterBuffers);
>}
> -  if (!state->es_shader) {
> +  if (state->is_version(110, 320)) {
>   add_const("gl_MaxTessControlAtomicCounterBuffers",
> state->Const.MaxTessControlAtomicCounterBuffers);
>   add_const("gl_MaxTessEvaluationAtomicCounterBuffers",
> 

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 3/7] glsl: expose max atomic counter/buffer consts for tess in ES 3.2

2016-08-28 Thread Ilia Mirkin
Curiously OES/EXT_tessellation_shader leave these out, while ES 3.2 adds
them in.

Signed-off-by: Ilia Mirkin 
---
 src/compiler/glsl/builtin_variables.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/glsl/builtin_variables.cpp 
b/src/compiler/glsl/builtin_variables.cpp
index 036261f..93d8c92 100644
--- a/src/compiler/glsl/builtin_variables.cpp
+++ b/src/compiler/glsl/builtin_variables.cpp
@@ -759,7 +759,7 @@ builtin_variable_generator::generate_constants()
  add_const("gl_MaxGeometryAtomicCounters",
state->Const.MaxGeometryAtomicCounters);
   }
-  if (!state->es_shader) {
+  if (state->is_version(110, 320)) {
  add_const("gl_MaxTessControlAtomicCounters",
state->Const.MaxTessControlAtomicCounters);
  add_const("gl_MaxTessEvaluationAtomicCounters",
@@ -781,7 +781,7 @@ builtin_variable_generator::generate_constants()
  add_const("gl_MaxGeometryAtomicCounterBuffers",
state->Const.MaxGeometryAtomicCounterBuffers);
   }
-  if (!state->es_shader) {
+  if (state->is_version(110, 320)) {
  add_const("gl_MaxTessControlAtomicCounterBuffers",
state->Const.MaxTessControlAtomicCounterBuffers);
  add_const("gl_MaxTessEvaluationAtomicCounterBuffers",
-- 
2.7.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev