On Wed, 2017-02-01 at 22:30 +, Emil Velikov wrote:
> From: Emil Velikov
>
> It's unlikely that any of the additions come as a suprise to anyone
> i915, nouveau, radeon, r200). Regardless, state clearly what's
Opening parenthesis? ^
Otherwise, LGTM.
Rev
LGTM
Reviewed-by: Andres Gomez
On Wed, 2017-02-01 at 22:30 +, Emil Velikov wrote:
> From: Emil Velikov
>
> Signed-off-by: Emil Velikov
> ---
> configure.ac | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configu
LGTM
Reviewed-by: Andres Gomez
On Wed, 2017-02-01 at 22:30 +, Emil Velikov wrote:
> From: Emil Velikov
>
> Note: we need the explicit --enable-freedreno for libdrm since the
> latter is 'smart' and disables it if building on !arm platforms.
>
> The ilo, rad
LGTM
Reviewed-by: Andres Gomez
On Wed, 2017-02-01 at 22:30 +, Emil Velikov wrote:
> From: Emil Velikov
>
> The current regex was tracking only the libdrm_foo packages, while with
> recent changed we bumped only (and rightfully so) libdrm.
>
> Fix the regex to track
Fixes GL45-CTS.enhanced_layouts.ssb_layout_qualifier_conflict
Signed-off-by: Andres Gomez
---
src/compiler/glsl/linker.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index b768a6e5285..ae13a45d22b 100644
--- a/src/com
Dropping this patch due to the discussion I opened at:
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=16238
The layout qualification among Uniform and Shader Storage Blocks across
a linked program must match.
Br.
On Sun, 2017-02-05 at 20:53 +0200, Andres Gomez wrote:
> The binding point i
k error will be reported on a program
like this:
"# VS
layout(binding = 1) Block1 {
vec4 color;
} uni_block;
...
# FS
layout(binding = 2) Block2 {
vec4 color;
} uni_block;
..."
Fixes GL45-CTS.enhanced_layouts.ssb_layout_qualifier_conflict
Si
ould succeed on linking:
"# VS
layout(binding = 1) Block1 {
vec4 color;
} uni_block;
...
# FS
layout(binding = 2) Block2 {
vec4 color;
} uni_block;
..."
Currently, it fails.
Fixes:
- GL45-CTS.enhanced_layouts.ssb_layout_qualifier_conflict
segmentation fault if trying to use the index of a
block in a link failed program.
Signed-off-by: Andres Gomez
Cc: Timothy Arceri
---
src/compiler/glsl/linker.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index b6f8bc4212e
ni_block2;
..."
Signed-off-by: Andres Gomez
Cc: Ian Romanick
---
src/compiler/glsl/link_uniform_blocks.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/compiler/glsl/link_uniform_blocks.cpp
b/src/compiler/glsl/link_uniform_blocks.cpp
index 839fd07fa4b..24
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_to_hir.cpp | 37 +
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index b90ad97b1de..d7a2b9ddc12 100644
--- a/src
I would welcome a reference to the text in Secption 7.3 of the OpenGL
ES 3.2 specs as a code comment and commit text but, other than that,
this is:
Reviewed-by: Andres Gomez
On Wed, 2017-02-22 at 17:54 -0800, Kenneth Graunke wrote:
> OpenGL allows the TCS to be missing and supplies an impli
This is:
Reviewed-by: Andres Gomez
On Thu, 2017-02-23 at 22:31 +, Vinson Lee wrote:
> CXXglsl/ast_to_hir.lo
> glsl/ast_to_hir.cpp: In member function 'virtual ir_rvalue*
> ast_declarator_list::hir(exec_list*, _mesa_glsl_parse_state*)':
> glsl/ast_to_hir.cpp:484
ut = ir_depth_layout_greater;
> - else if (qual->flags.q.depth_less)
> + else if (qual->depth_type == ast_depth_less)
>var->data.depth_layout = ir_depth_layout_less;
> - else if (qual->flags.q.depth_unchanged)
> + else if (qual->depth_type == ast_depth_unchanged)
> var->data.depth_layout = ir_depth_layout_unchanged;
> else
> var->data.depth_layout = ir_depth_layout_none;
Maybe replace this with a ?
switch(qual->depth_type) {
case ast_depth_any:
...
}
Other than that nitpick, this is:
Reviewed-by: Andres Gomez
--
Br,
Andres
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
This is:
Reviewed-by: Andres Gomez
On Thu, 2017-02-23 at 19:17 +0100, Samuel Pitoiset wrote:
> Signed-off-by: Samuel Pitoiset
> ---
> src/compiler/glsl/ast_type.cpp | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/compiler/glsl/ast_type.cpp b
if the
"is_single_layout_merge" parameter is on, since the GLSL parser works
in this case from right to left.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/compiler/glsl/ast_type.cpp b/src/
ader are
valid.
Fixes:
- GL44-CTS.shading_language_420pack.qualifier_override_layout
- GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Andres Gomez (5):
glsl: last duplicated layout-qualifier-name in a layout-qualifier
overrides the former
glsl: last duplicated layout-qualifier-name in multiple
layout-q
e are pushing this to the global values since
before it was mixed in the merging call and we only run this once all
the processing for layout-qualifiers in a declaration has happened.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 6 +
src/compiler/glsl/ast_type.cpp
ession is now done
prepending instead of appending since the processing of the qualifier
constant returns the first value in the list and the last appearing
declaration of a variable or default overrides the previous
declarations.
Fixes GL44-CTS.shading_language_420pack.qualifier_override_layout
Signed
e error to have different
values specified for the stride for the same buffer."
Fixes GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 2 +-
src/compiler/glsl/glsl_parser_extras.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deleti
Since we modified the way in which multiple repetitions of the same
layout-qualifier-name in a single declaration collapse into the
ast_type_qualifier class, we can simplify the merge_[in|out]_qualifier
APIs through removing the create_node parameter.
Signed-off-by: Andres Gomez
---
src
Hi,
On Mon, 2016-05-23 at 14:18 +1000, Dave Airlie wrote:
> From: Dave Airlie
>
> A CTS test manages to generate this:
> GL45-CTS.shading_language_420pack.qualifier_order
>
> I cannot find definitive evidence in the spec that it isn't
> allowed. The specs mentions some things can't be used on
>
FTR, I rebased this series on top of current master (minimal changes)
and run a full CTS and piglit run with the i965 [gen 8].
The failing CTS now passes and I have not observed any regression nor
in CTS neither in piglit.
On Tue, 2016-06-07 at 15:25 +1000, Dave Airlie wrote:
> So when I impleme
On Tue, 2016-06-07 at 16:23 +0200, Iago Toral wrote:
> On Tue, 2016-06-07 at 15:25 +1000, Dave Airlie wrote:
> > From: Dave Airlie
> >
> > One piece of ARB_shader_subroutine I ignored was the fact that it
> > needs to store the subroutine index data per context and not per
> > shader program.
> >
comment
above).
> + ctx->SubroutineIndex[sh->Stage].NumIndex =
> sh->NumSubroutineUniformRemapTable;
> + }
> +
> + for (i = 0; i < sh->NumSubroutineUniformRemapTable; i++) {
> + struct gl_uniform_storage *uni = sh->Subr
@@ -69,6 +69,9 @@ _mesa_count_active_attribs(struct gl_shader_program
> *shProg);
> extern size_t
> _mesa_longest_attribute_name_length(struct gl_shader_program *shProg);
>
> +extern void
> +_mesa_shader_write_subroutine_indicies(struct gl_context *ctx,
> +
/drivers/dri/i965/gen7_ds_state.c
> @@ -25,6 +25,7 @@
> #include "brw_state.h"
> #include "brw_defines.h"
> #include "intel_batchbuffer.h"
> +#include "main/shaderapi.h"
>
> static void
> gen7_upload_tes_push_constants(struct brw_context
ext *ctx, GLint x, GLint y,
> * into the constant buffer, we need to update them
> */
>st_upload_constants(st, st->fp->Base.Base.Parameters,
> - PIPE_SHADER_FRAGMENT);
> + MESA_SHADER_FRAGMENT);
> }
>
> /*
sa_shader_init_subroutine_defaults(struct gl_context
> *ctx,
> continue;
>ctx->SubroutineIndex[sh->Stage].IndexPtr[i] =
> find_compat_subroutine(sh, uni->type);
> }
> -
> - _mesa_shader_write_subroutine_index(ctx, sh);
> }
>
> void
This is:
R
On Tue, 2016-08-23 at 10:45 +1000, Dave Airlie wrote:
> >
> > > #include "main/mtypes.h"
> > > #include "program/prog_parameter.h"
> > > -
> > > +#include "main/shaderapi.h"
> >
> > Why the extra empty line? If so, I would put it after the new include.
>
> It actually removes the empty line, b
If nobody says otherwise, I will land this by the beginning of next
week.
On Tue, 2016-08-02 at 19:14 +0300, Andres Gomez wrote:
> Signed-off-by: Andres Gomez
> ---
> .dir-locals.el | 9 +++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/.di
On Thu, 2016-09-08 at 09:59 -0400, Ilia Mirkin wrote:
> On Tue, Aug 2, 2016 at 12:14 PM, Andres Gomez wrote:
> > Signed-off-by: Andres Gomez
> > ---
> > .dir-locals.el | 9 +++--
> > 1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff
On Thu, 2016-09-08 at 12:04 -0400, Ilia Mirkin wrote:
> On Thu, Sep 8, 2016 at 12:01 PM, Andres Gomez wrote:
> > It will highlight malformed indentation
>
> Malformed meaning what?
Usage of tabs, instead of spaces.
> > and change color of the
> > characters exce
ier-name
>
> On Fri, 2016-10-07 at 01:52 +0300, Andres Gomez wrote:
> > In a declaration, when a layout qualifier appears and holds
> > duplicated
> > layout-qualifier-name, only the last occurrence should be taken into
> > account.
>
>
> Slight chang
d in the v2 series to come ...
> On Fri, 2016-10-07 at 01:52 +0300, Andres Gomez wrote:
> > From page 46 (page 52 of the PDF) of the GLSL 4.20 spec:
> >
> > " More than one layout qualifier may appear in a single
> > declaration. If the same layout-qualifier-name
_layouts.xfb_duplicated_stride
Andres Gomez (9):
glsl: ignore all but the rightmost layout-qualifier-name
glsl: merge layouts into the default one as the last step in interface
blocks
glsl: ignore all but the rightmost layout qualifier name from the
rightmost layout qualifier
glsl:
rrence(s) within the declaration are not present.
This is also true for overriding layout-qualifier-names, where one
overrides the other (e.g., row_major vs. column_major); only the
last
occurrence has any effect.""
Signed-off-by: Andres Gomez
-
different values.
In other words, the list is used for an after check that all the
declared values for a layout-qualifier-name are consistent.
Therefore, the values stored must match always, not just for
"max_vertices" or any other eventual layout-qualifier-name.
Signed-off-by: Andres Gomez
ause max_vertices=2 is ignored.
When merging qualifiers in an ast_type_qualifier, we now simply ignore
new appearances of a same layout-qualifier-name if the
"is_single_layout_merge" parameter is true, this works because the GLSL
parser processes qualifiers from right to left.
Reviewed-b
e are pushing this to the global values since
before it was mixed in the merging call and we only run this once all
the processing for layout-qualifiers in a declaration has happened.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 6 +
src/compiler/glsl/ast_type.cpp
Since we modified the way in which multiple repetitions of the same
layout-qualifier-name in a single declaration collapse into the
ast_type_qualifier class, we can simplify the merge_[in|out]_qualifier
APIs through removing the create_node parameter.
Signed-off-by: Andres Gomez
---
src
done from left to right and, as a last step, we
merge into the default layout qualifier if needed, so the values of
the explicit layouts prevail over it.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 9 ++---
src/compiler/glsl/ast_type.cpp | 9
) of the GLSL 4.40 spec:
" While xfb_stride can be declared multiple times for the same
buffer, it is a compile-time or link-time error to have different
values specified for the stride for the same buffer."
Fixes GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Signed-off-
nguage_420pack.qualifier_override_layout
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 3 +-
src/compiler/glsl/ast_type.cpp | 28 ++---
src/compiler/glsl/glsl_parser.yy | 125 ++-
3 files changed, 79 insertions(+), 77 deletions(-)
di
Tthe GLSL parser has been simplified to check for the needed
GL_ARB_shading_language_420pack extension just when merging the
qualifiers in the proper cases.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 6 ++
src/compiler/glsl/glsl_parser.yy | 24
Provides support to highlighting incorrect indentation.
v2: Removed too long lines trail highlighting, as suggested by Ilia
Mirkin.
Signed-off-by: Andres Gomez
---
.dir-locals.el | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.dir-locals.el b/.dir-locals.el
Provides support for highlighting incorrect indentation.
v2: Removed too long lines trail highlighting, as suggested by Ilia
Mirkin.
Signed-off-by: Andres Gomez
---
.dir-locals.el | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.dir-locals.el b/.dir-locals.el
On Mon, 2016-10-24 at 14:09 +1100, Timothy Arceri wrote:
> On Sat, 2016-10-22 at 23:09 +0300, Andres Gomez wrote:
> >
>
>
>
>
> > + | layout_qualifier BUFFER ';'
> > ;
> >
> > layout_in_defaults:
> > layou
On Mon, 2016-10-24 at 13:44 +1100, Timothy Arceri wrote:
> On Sat, 2016-10-22 at 23:09 +0300, Andres Gomez wrote:
> > After the previous modifications in the merging of the
> > layout-qualifier-name values, we no longer push the final value in a
> > declaration to the global
On Mon, 2016-10-24 at 14:09 +1100, Timothy Arceri wrote:
> I'm not sure we can do this see my last commets to patch 3.
As commented previously, I've created new tests for input, output,
uniform and global default declarations using non-value layout-
qualifier-ids and multiple layout-qualifiers in
On Wed, 2016-10-26 at 11:47 +1100, Timothy Arceri wrote:
> Did you test early_fragment_tests specifically? This is one that I
> checked is only in merge_in_qualifier() and not merge_qualifier()
AFAIK, early_fragment_tests is the only default input layout-qualifier-
name for a fragment shader (see
alifier_override_layout
- GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Andres Gomez (8):
glsl: ignore all but the rightmost layout-qualifier-name
glsl: merge layouts into the default one as the last step in interface
blocks
glsl: ignore all but the rightmost layout qualifier name
Tthe GLSL parser has been simplified to check for the needed
GL_ARB_shading_language_420pack extension just when merging the
qualifiers in the proper cases.
Reviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 6 ++
src/compiler/glsl
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 3 +--
src/compiler/glsl/ast_type.cpp | 17 +++--
src/compiler/glsl/glsl_parser_extras.cpp | 2 +-
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/compiler/glsl/ast.h b/src/com
eviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 9 ++---
src/compiler/glsl/ast_type.cpp | 9 +
src/compiler/glsl/glsl_parser.yy | 24
src/compiler/glsl/glsl_parser_extras.cpp | 20 +
e are pushing this to the global values since
before it was mixed in the merging call and we only run this once all
the processing for layout-qualifiers in a declaration has happened.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 6 +
src/compiler/glsl/ast_type.cpp
Since we modified the way in which multiple repetitions of the same
layout-qualifier-name in a single declaration collapse into the
ast_type_qualifier class, we can simplify the merge_[in|out]_qualifier
APIs through removing the create_node parameter.
Signed-off-by: Andres Gomez
---
src
ause max_vertices=2 is ignored.
When merging qualifiers in an ast_type_qualifier, we now simply ignore
new appearances of a same layout-qualifier-name if the
"is_single_layout_merge" parameter is true, this works because the GLSL
parser processes qualifiers from right to left.
Reviewed-b
Hi,
recently, we have noticed that we are not receiving some of the mails
that we have sent to the ML.
The mails are archived, though, but we don't get the copy from the ML.
We were checking if this was a problem in our side. However, we've
checked that they don't appear either in patchwork so
On Mon, 2016-10-24 at 12:23 +1100, Timothy Arceri wrote:
> On Sat, 2016-10-22 at 23:09 +0300, Andres Gomez wrote:
> > Consider this example:
> >
> > " #version 150 core
> > #extension GL_ARB_shading_language_420pack: require
> > #extension GL
nguage_420pack.qualifier_override_layout
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 3 +-
src/compiler/glsl/ast_type.cpp | 28 ++---
src/compiler/glsl/glsl_parser.yy | 125 ++-
3 files changed, 79 insertions(+), 77 deletions(-)
di
) of the GLSL 4.40 spec:
" While xfb_stride can be declared multiple times for the same
buffer, it is a compile-time or link-time error to have different
values specified for the stride for the same buffer."
Fixes GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Reviewed-by:
On Wed, 2016-10-26 at 19:35 +0300, Andres Gomez wrote:
> Hi,
>
> recently, we have noticed that we are not receiving some of the mails
> that we have sent to the ML.
>
> The mails are archived, though, but we don't get the copy from the ML.
>
> We were checking
On Thu, 2016-10-27 at 12:14 +0100, Emil Velikov wrote:
> On 27 October 2016 at 12:06, Andres Gomez wrote:
> > On Wed, 2016-10-26 at 19:35 +0300, Andres Gomez wrote:
> > > Hi,
> > >
> > > recently, we have noticed that we are not receiving some of the mai
On Thu, 2016-10-27 at 14:47 +0300, Martin Peres wrote:
> These are know issues and are being investigated by the freedes
Thanks Martin!
--
Br,
Andres
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listin
If nobody says otherwise, I will land this by the beginning of next
week.
On Sun, 2016-10-23 at 00:10 +0300, Andres Gomez wrote:
> Provides support for highlighting incorrect indentation.
>
> v2: Removed too long lines trail highlighting, as suggested by Ilia
> Mirkin.
>
White Space mode is not activated the set variables would
not have any effect.
v2: Removed too long lines trail highlighting, as suggested by Ilia
Mirkin.
Signed-off-by: Andres Gomez
---
.dir-locals.el | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.dir
On Thu, 2016-11-10 at 19:21 +1100, Timothy Arceri wrote:
> On Wed, 2016-11-09 at 23:09 -0800, Kenneth Graunke wrote:
> > On Wednesday, October 26, 2016 6:30:43 PM PST Andres Gomez wrote:
> > [snip]
> > >
> > > The main changes in this v3 series are:
> > &g
ause max_vertices=2 is ignored.
When merging qualifiers in an ast_type_qualifier, we now simply ignore
new appearances of a same layout-qualifier-name if the
"is_single_layout_merge" parameter is true, this works because the GLSL
parser processes qualifiers from right to left.
Reviewed-b
patch v3 8/8 is now patch 9/13 to be closer in the log history
with the other related changes.
Fixes:
- GL44-CTS.shading_language_420pack.qualifier_override_layout
- GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Andres Gomez (13):
glsl: ignore all but the rightmost layout-qualifier-name
the method is the
one validated and merged against the default out qualifier.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 16 ++--
src/compiler/glsl/ast_type.cpp | 79 +---
src/compiler/glsl/glsl_parser.yy | 13 +--
3 files
we
do check its value.
Added comments explaining this.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
index 064c63b..7c59747 100644
--- a/src/compiler/glsl
nguage_420pack.qualifier_override_layout
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 3 +-
src/compiler/glsl/ast_type.cpp | 28 ++---
src/compiler/glsl/glsl_parser.yy | 130 +++
3 files changed, 84 insertions(+), 77 deletions(-)
di
e are pushing this to the global values since
before it was mixed in the merging call and we only run this once all
the processing for layout-qualifiers in a declaration has happened.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 6 +
src/compiler/glsl/ast_type.cpp
The GLSL parser has been simplified to check for the needed
GL_ARB_shading_language_420pack extension just when merging the
qualifiers in the proper cases.
Reviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 6 ++
src/compiler/glsl/glsl_parser.yy
the method is the
one validated and merged against the default in qualifier.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 16 +++--
src/compiler/glsl/ast_type.cpp | 127 ++-
src/compiler/glsl/glsl_parser.yy | 12 ++--
3 files changed
Since we modified the way in which multiple repetitions of the same
layout-qualifier-name in a single declaration collapse into the
ast_type_qualifier class, we can simplify the
merge_into_[in|out]_qualifier APIs through removing the create_node
parameter.
Signed-off-by: Andres Gomez
---
src
eviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 9 ++---
src/compiler/glsl/ast_type.cpp | 9 +
src/compiler/glsl/glsl_parser.yy | 24
src/compiler/glsl/glsl_parser_extras.cpp | 20 +
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 3 +--
src/compiler/glsl/ast_type.cpp | 17 +++--
src/compiler/glsl/glsl_parser_extras.cpp | 2 +-
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/compiler/glsl/ast.h b/src/com
present in the merge for the
default in layout qualifier and the specific validation bits have been
moved to the validation method for the default in layout qualifier.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 165 -
1 file changed, 81
) of the GLSL 4.40 spec:
" While xfb_stride can be declared multiple times for the same
buffer, it is a compile-time or link-time error to have different
values specified for the stride for the same buffer."
Fixes GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Reviewed-by:
ror in the shader has been replaced by an assert.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_to_hir.cpp | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 9b8678c..c2ce389 100644
On Thu, 2016-11-17 at 16:45 +1100, Timothy Arceri wrote:
> I might have asked you this before. Is there a reason why we can't call
> merge_qualifier from merge_into_in_qualifier() like we do
> in merge_into_out_qualifier() to take care of some of these for us?
> Since there is duplicate code.
Ans
On Thu, 2016-11-17 at 16:47 +1100, Timothy Arceri wrote:
> On Mon, 2016-11-14 at 19:15 +0200, Andres Gomez wrote:
> > The point mode value in an ast_type_qualifier can only be true if the
> > flag is already set since this layout-id-qualifier can only be or not
> > b
On Thu, 2016-11-17 at 16:56 +1100, Timothy Arceri wrote:
> On Mon, 2016-11-14 at 19:15 +0200, Andres Gomez wrote:
...
> > diff --git a/src/compiler/glsl/glsl_parser.yy
> > b/src/compiler/glsl/glsl_parser.yy
> > index 50f7097..9f18c15 100644
> > --- a/src/compiler/glsl/g
On Thu, 2016-11-17 at 16:17 +1100, Timothy Arceri wrote:
> On Mon, 2016-11-14 at 19:15 +0200, Andres Gomez wrote:
...
> > diff --git a/src/compiler/glsl/ast_type.cpp
> > b/src/compiler/glsl/ast_type.cpp
> > index 803d952..064c63b 100644
> > --- a/src/compiler/glsl
for coherence and raising a compilation
error. Suggested by Timothy.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
index
On Tue, 2016-11-22 at 22:22 +1100, Timothy Arceri wrote:
...
>
> Can I ask that you write a follow up patch for this series that creates
> a helper function for each of these validations. For example:
>
> static bool
> validate_ordering(loc, state, qualifier, new_qualifier)
> {
> if (qualifier
On Wed, 2016-11-23 at 08:46 +1100, Timothy Arceri wrote:
> On Tue, 2016-11-22 at 16:07 +0200, Andres Gomez wrote:
> > On Tue, 2016-11-22 at 22:22 +1100, Timothy Arceri wrote:
> > ...
> > >
> > >
> > > Can I ask that you write a follow up patch for thi
ause max_vertices=2 is ignored.
When merging qualifiers in an ast_type_qualifier, we now simply ignore
new appearances of a same layout-qualifier-name if the
"is_single_layout_merge" parameter is true, this works because the GLSL
parser processes qualifiers from right to left.
Reviewed-b
eviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 9 ++---
src/compiler/glsl/ast_type.cpp | 9 +
src/compiler/glsl/glsl_parser.yy | 24
src/compiler/glsl/glsl_parser_extras.cpp | 20 +
New patch 8/14.
Fixes:
- GL44-CTS.shading_language_420pack.qualifier_override_layout
- GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Andres Gomez (14):
glsl: ignore all but the rightmost layout-qualifier-name
glsl: merge layouts into the default one as the last step in interface
blocks
for coherence and raising a compilation
error. Suggested by Timothy.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
index
ror in the shader has been replaced by an assert.
Reviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_to_hir.cpp | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
ind
present in the merge for the
default in layout qualifier and the specific validation bits have been
moved to the validation method for the default in layout qualifier.
Reviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 165
the method is the
one validated and merged against the default out qualifier.
Reviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 16 ++--
src/compiler/glsl/ast_type.cpp | 80 +---
src/compiler/glsl
-by: Andres Gomez
---
src/compiler/glsl/ast.h | 4 ++--
src/compiler/glsl/ast_type.cpp | 14 ++
src/compiler/glsl/glsl_parser.yy | 4 ++--
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/compiler/glsl/ast.h b/src/compiler/glsl/ast.h
index 7bbb588
Several layout-qualifier validations are duplicated in the
merge_qualifier and validate_in_qualifier methods.
We would rather have them refactored into single calls.
Suggested by Timothy.
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast_type.cpp | 126
the method is the
one validated and merged against the default in qualifier.
Reviewed-by: Timothy Arceri
Signed-off-by: Andres Gomez
---
src/compiler/glsl/ast.h | 16 +++--
src/compiler/glsl/ast_type.cpp | 127 ++-
src/compiler/glsl/glsl_parser.yy
) of the GLSL 4.40 spec:
" While xfb_stride can be declared multiple times for the same
buffer, it is a compile-time or link-time error to have different
values specified for the stride for the same buffer."
Fixes GL44-CTS.enhanced_layouts.xfb_duplicated_stride
Reviewed-by:
1 - 100 of 665 matches
Mail list logo
