Re: [Mesa-dev] [PATCH] i965: fix struct type in comment

2016-04-09 Thread Eduardo Lima Mitev 

Reviewed-by: Eduardo Lima Mitev 

On 04/10/2016 04:28 AM, Timothy Arceri wrote:

---
  src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp 
b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
index f3361d6..636340a 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@@ -75,7 +75,7 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, 
nir_variable *var,
 int namelen = strlen(var->name);

 /* The data for our (non-builtin) uniforms is stored in a series of
-* gl_uniform_driver_storage structs for each subcomponent that
+* gl_uniform_storage structs for each subcomponent that
  * glGetUniformLocation() could name.  We know it's been set up in the same
  * order we'd walk the type, so walk the list of storage and find anything
  * with our name, or the prefix of a component that starts with our name.



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

[Mesa-dev] [PATCH] i965: fix struct type in comment

2016-04-09 Thread Timothy Arceri 
---
 src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp 
b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
index f3361d6..636340a 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@@ -75,7 +75,7 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, 
nir_variable *var,
int namelen = strlen(var->name);
 
/* The data for our (non-builtin) uniforms is stored in a series of
-* gl_uniform_driver_storage structs for each subcomponent that
+* gl_uniform_storage structs for each subcomponent that
 * glGetUniformLocation() could name.  We know it's been set up in the same
 * order we'd walk the type, so walk the list of storage and find anything
 * with our name, or the prefix of a component that starts with our name.
-- 
2.5.5

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

Re: [Mesa-dev] [PATCH] glsl: allow usage of the keyword buffer before GLSL 430 / ESSL 310

2016-04-09 Thread Ilia Mirkin 
On Sat, Apr 9, 2016 at 7:57 PM, Timothy Arceri
 wrote:
> On Sat, 2016-04-09 at 13:13 -0400, Ilia Mirkin wrote:
>> The GLSL 4.20 and ESSL 3.00 specs don't list 'buffer' as a reserved
>> keyword. Make the parser ignore it unless GLSL 4.30 / ESSL 3.10 are
>> used, or ARB_shader_storage_buffer_objects is enabled.
>>
>> Signed-off-by: Ilia Mirkin 
>> Cc: mesa-sta...@lists.freedesktop.org
>
> Seems right. Reviewed-by: Timothy Arceri 
>
> Does this fix a bug somewhere? Or just something you noticed?

Someone came into #nouveau asking why their shader didn't compile. I
suggested changing the var name as a short term fix, but figured I'd
fix it too.

>
>
>> ---
>>  src/compiler/glsl/glsl_lexer.ll | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/compiler/glsl/glsl_lexer.ll
>> b/src/compiler/glsl/glsl_lexer.ll
>> index 0b7695f..6b1ef17 100644
>> --- a/src/compiler/glsl/glsl_lexer.ll
>> +++ b/src/compiler/glsl/glsl_lexer.ll
>> @@ -304,7 +304,7 @@ inreturn IN_TOK;
>>  out  return OUT_TOK;
>>  inoutreturn INOUT_TOK;
>>  uniform  return UNIFORM;
>> -buffer   return BUFFER;
>> +buffer   KEYWORD_WITH_ALT(0, 0, 430, 310, yyextra-
>> >ARB_shader_storage_buffer_object_enable, BUFFER);
>>  varying  DEPRECATED_ES_KEYWORD(VARYING);
>>  centroid KEYWORD(120, 300, 120, 300, CENTROID);
>>  invariantKEYWORD(120, 100, 120, 100, INVARIANT);
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] glsl: allow usage of the keyword buffer before GLSL 430 / ESSL 310

2016-04-09 Thread Timothy Arceri 
On Sat, 2016-04-09 at 13:13 -0400, Ilia Mirkin wrote:
> The GLSL 4.20 and ESSL 3.00 specs don't list 'buffer' as a reserved
> keyword. Make the parser ignore it unless GLSL 4.30 / ESSL 3.10 are
> used, or ARB_shader_storage_buffer_objects is enabled.
> 
> Signed-off-by: Ilia Mirkin 
> Cc: mesa-sta...@lists.freedesktop.org

Seems right. Reviewed-by: Timothy Arceri 

Does this fix a bug somewhere? Or just something you noticed?


> ---
>  src/compiler/glsl/glsl_lexer.ll | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/compiler/glsl/glsl_lexer.ll
> b/src/compiler/glsl/glsl_lexer.ll
> index 0b7695f..6b1ef17 100644
> --- a/src/compiler/glsl/glsl_lexer.ll
> +++ b/src/compiler/glsl/glsl_lexer.ll
> @@ -304,7 +304,7 @@ inreturn IN_TOK;
>  out  return OUT_TOK;
>  inoutreturn INOUT_TOK;
>  uniform  return UNIFORM;
> -buffer   return BUFFER;
> +buffer   KEYWORD_WITH_ALT(0, 0, 430, 310, yyextra-
> >ARB_shader_storage_buffer_object_enable, BUFFER);
>  varying  DEPRECATED_ES_KEYWORD(VARYING);
>  centroid KEYWORD(120, 300, 120, 300, CENTROID);
>  invariantKEYWORD(120, 100, 120, 100, INVARIANT);
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] scons: Build NIR.

2016-04-09 Thread Rob Clark 
On Sat, Apr 9, 2016 at 7:16 PM, Rob Clark  wrote:
> From: Jose Fonseca 
>
> Signed-off-by: Rob Clark 
> ---

I should have added that this was originally Jose's patch and I
rebased on the src/compiler move..

he had additional patches to make NIR build w/ MSVC, but this is
enough (with one additional bit squashed into mesa/st NIR patch) to
make scons build for linux work with my gallium NIR patchset.

BR,
-R

>  src/compiler/SConscript | 57 
> +++--
>  1 file changed, 55 insertions(+), 2 deletions(-)
>
> diff --git a/src/compiler/SConscript b/src/compiler/SConscript
> index 8d71b82..8a0823e 100644
> --- a/src/compiler/SConscript
> +++ b/src/compiler/SConscript
> @@ -1,5 +1,7 @@
>  Import('*')
>
> +from sys import executable as python_cmd
> +
>  env = env.Clone()
>
>  env.MSVC2013Compat()
> @@ -11,13 +13,64 @@ env.Prepend(CPPPATH = [
>  '#src/mesa',
>  '#src/gallium/include',
>  '#src/gallium/auxiliary',
> +'#src/compiler',
> +'#src/compiler/nir',
> +])
> +
> +
> +# Make generated headers reachable from the include path.
> +env.Append(CPPPATH = [
> +   Dir('nir').abspath
>  ])
>
> -sources = env.ParseSourceList('Makefile.sources', 'LIBCOMPILER_FILES')
> +# nir generated sources
> +
> +nir_builder_opcodes_h = env.CodeGenerate(
> +target = 'nir/nir_builder_opcodes.h',
> +script = 'nir/nir_builder_opcodes_h.py',
> +source = [],
> +command = python_cmd + ' $SCRIPT > $TARGET'
> +)
> +
> +env.CodeGenerate(
> +target = 'nir/nir_constant_expressions.c',
> +script = 'nir/nir_constant_expressions.py',
> +source = [],
> +command = python_cmd + ' $SCRIPT > $TARGET'
> +)
> +
> +env.CodeGenerate(
> +target = 'nir/nir_opcodes.h',
> +script = 'nir/nir_opcodes_h.py',
> +source = [],
> +command = python_cmd + ' $SCRIPT > $TARGET'
> +)
> +
> +env.CodeGenerate(
> +target = 'nir/nir_opcodes.c',
> +script = 'nir/nir_opcodes_c.py',
> +source = [],
> +command = python_cmd + ' $SCRIPT > $TARGET'
> +)
> +
> +env.CodeGenerate(
> +target = 'nir/nir_opt_algebraic.c',
> +script = 'nir/nir_algebraic.py',
> +source = [],
> +command = python_cmd + ' $SCRIPT > $TARGET'
> +)
> +
> +# parse Makefile.sources
> +source_lists = env.ParseSourceList('Makefile.sources')
> +
> +nir_sources = []
> +nir_sources += source_lists['LIBCOMPILER_FILES']
> +nir_sources += source_lists['NIR_FILES']
> +nir_sources += source_lists['NIR_GENERATED_FILES']
>
>  compiler = env.ConvenienceLibrary(
>  target = 'compiler',
> -source = sources
> +source = nir_sources
>  )
>  Export('compiler')
>
> --
> 2.5.5
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] scons: Build NIR.

2016-04-09 Thread Rob Clark 
From: Jose Fonseca 

Signed-off-by: Rob Clark 
---
 src/compiler/SConscript | 57 +++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/compiler/SConscript b/src/compiler/SConscript
index 8d71b82..8a0823e 100644
--- a/src/compiler/SConscript
+++ b/src/compiler/SConscript
@@ -1,5 +1,7 @@
 Import('*')
 
+from sys import executable as python_cmd
+
 env = env.Clone()
 
 env.MSVC2013Compat()
@@ -11,13 +13,64 @@ env.Prepend(CPPPATH = [
 '#src/mesa',
 '#src/gallium/include',
 '#src/gallium/auxiliary',
+'#src/compiler',
+'#src/compiler/nir',
+])
+
+
+# Make generated headers reachable from the include path.
+env.Append(CPPPATH = [
+   Dir('nir').abspath
 ])
 
-sources = env.ParseSourceList('Makefile.sources', 'LIBCOMPILER_FILES')
+# nir generated sources
+
+nir_builder_opcodes_h = env.CodeGenerate(
+target = 'nir/nir_builder_opcodes.h',
+script = 'nir/nir_builder_opcodes_h.py',
+source = [],
+command = python_cmd + ' $SCRIPT > $TARGET'
+)
+
+env.CodeGenerate(
+target = 'nir/nir_constant_expressions.c',
+script = 'nir/nir_constant_expressions.py',
+source = [],
+command = python_cmd + ' $SCRIPT > $TARGET'
+)
+
+env.CodeGenerate(
+target = 'nir/nir_opcodes.h',
+script = 'nir/nir_opcodes_h.py',
+source = [],
+command = python_cmd + ' $SCRIPT > $TARGET'
+)
+
+env.CodeGenerate(
+target = 'nir/nir_opcodes.c',
+script = 'nir/nir_opcodes_c.py',
+source = [],
+command = python_cmd + ' $SCRIPT > $TARGET'
+)
+
+env.CodeGenerate(
+target = 'nir/nir_opt_algebraic.c',
+script = 'nir/nir_algebraic.py',
+source = [],
+command = python_cmd + ' $SCRIPT > $TARGET'
+)
+
+# parse Makefile.sources
+source_lists = env.ParseSourceList('Makefile.sources')
+
+nir_sources = []
+nir_sources += source_lists['LIBCOMPILER_FILES']
+nir_sources += source_lists['NIR_FILES']
+nir_sources += source_lists['NIR_GENERATED_FILES']
 
 compiler = env.ConvenienceLibrary(
 target = 'compiler',
-source = sources
+source = nir_sources
 )
 Export('compiler')
 
-- 
2.5.5

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

[Mesa-dev] [PATCH 8/9] doxygen: Fix typo in doxygen/tnl.doxy

2016-04-09 Thread Rhys Kidd 
TAGFILE relative folder should match .tag file

Signed-off-by: Rhys Kidd 
---
 doxygen/tnl.doxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index b985b8d..e6d6572 100644
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -40,7 +40,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = tnl_dd.tag=../tnl \
+TAGFILES   = tnl_dd.tag=../tnl_dd \
  main.tag=../main \
  math.tag=../math \
  swrast.tag=../swrast \
-- 
2.5.0

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

[Mesa-dev] [PATCH 5/9] doxygen: Remove references to miniglx

2016-04-09 Thread Rhys Kidd 
miniglx was removed in February 2010. Clean up remaining
unnecessary doxygen references.

  commit a9e36696837b2c31ecee4017a0adffbd987c1eff
  Author: Kristian Høgsberg 
  Date:   Thu Feb 25 16:17:04 2010 -0500

  Remove remaining miniglx references

Signed-off-by: Rhys Kidd 
---
 doxygen/.gitignore | 1 -
 doxygen/core_subset.doxy   | 3 +--
 doxygen/header_subset.html | 1 -
 doxygen/radeon_subset.doxy | 3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index 1c186cb..ddb2093 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -13,7 +13,6 @@ i965
 main
 math
 math_subset
-miniglx
 radeondrm
 radeonfb
 radeon_subset
diff --git a/doxygen/core_subset.doxy b/doxygen/core_subset.doxy
index dfa59f4..4123485 100644
--- a/doxygen/core_subset.doxy
+++ b/doxygen/core_subset.doxy
@@ -190,8 +190,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---
 TAGFILES   = \
-math_subset.tag=../math_subset \
-miniglx.tag=../miniglx
+math_subset.tag=../math_subset
 GENERATE_TAGFILE   = core_subset.tag
 ALLEXTERNALS   = NO
 PERL_PATH  = 
diff --git a/doxygen/header_subset.html b/doxygen/header_subset.html
index f9a698d..4dacc15 100644
--- a/doxygen/header_subset.html
+++ b/doxygen/header_subset.html
@@ -6,6 +6,5 @@
 
 Mesa Core |
 math |
-MiniGLX |
 radeon_subset
 
diff --git a/doxygen/radeon_subset.doxy b/doxygen/radeon_subset.doxy
index fb9d0e9..ad4399c 100644
--- a/doxygen/radeon_subset.doxy
+++ b/doxygen/radeon_subset.doxy
@@ -168,8 +168,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 TAGFILES   = \
 core_subset.tag=../core_subset \
- math_subset.tag=../math_subset \
- miniglx.tag=../miniglx
+ math_subset.tag=../math_subset
 GENERATE_TAGFILE   = radeon_subset.tag
 ALLEXTERNALS   = NO
 PERL_PATH  = 
-- 
2.5.0

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

[Mesa-dev] [PATCH 9/9] doxygen: Remove deprecated settings in common.doxy

2016-04-09 Thread Rhys Kidd 
These Doxygen features are deprecated, as reported by Doxygen 1.8.9.1

Warning: Tag `USE_WINDOWS_ENCODING' at line 66 of file `common.doxy' has become 
obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `DETAILS_AT_TOP' at line 157 of file `common.doxy' has become 
obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `HTML_ALIGN_MEMBERS' at line 616 of file `common.doxy' has become 
obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `XML_SCHEMA' at line 848 of file `common.doxy' has become obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `XML_DTD' at line 854 of file `common.doxy' has become obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `MAX_DOT_GRAPH_WIDTH' at line 1115 of file `common.doxy' has 
become obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"
Warning: Tag `MAX_DOT_GRAPH_HEIGHT' at line 1123 of file `common.doxy' has 
become obsolete.
 To avoid this warning please remove this line from your configuration 
file or upgrade it using "doxygen -u"

Signed-off-by: Rhys Kidd 
---
 doxygen/common.doxy | 51 ---
 1 file changed, 51 deletions(-)

diff --git a/doxygen/common.doxy b/doxygen/common.doxy
index 48f0c95..eec59c4 100644
--- a/doxygen/common.doxy
+++ b/doxygen/common.doxy
@@ -53,16 +53,6 @@ CREATE_SUBDIRS = NO
 
 OUTPUT_LANGUAGE= English
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows 
users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
 # the file and class documentation (similar to JavaDoc). 
@@ -147,13 +137,6 @@ JAVADOC_AUTOBRIEF  = YES
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP = YES
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # re-implements.
@@ -607,12 +590,6 @@ HTML_FOOTER=
 
 HTML_STYLESHEET= 
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
 # Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
@@ -839,18 +816,6 @@ GENERATE_XML   = NO
 
 XML_OUTPUT = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD= 
-
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
 # dump the program listings (including syntax highlighting 
 # and cross-referencing information) to the XML output. Note that 
@@ -1104,22 +1069,6 @@ DOT_PATH   =
 
 DOTFILE_DIRS   = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH= 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot

[Mesa-dev] [PATCH 2/9] doxygen: Fix doxygen/glapi.doxy

2016-04-09 Thread Rhys Kidd 
The src/mesa/glapi folder was relocated in the below commit.
Amend the doxygen/glapi.doxy INPUT setting accordingly.

Whilst here, in addition this change also avoids a bug in the
consolidated Doxygen output caused by doxygen/glapi.doxy inadvertently
overwriting doxygen/swrast.tag via its GENERATE_TAGFILE setting.

This bug depended upon the specific order each *.tag was built.

   commit 296adbd545b8efd38c9ed508166b2de2764a444b
   Author: Chia-I Wu 
   Date:   Mon Apr 26 12:56:44 2010 +0800

   glapi: Move to src/mapi/.

   Move glapi to src/mapi/{glapi,es1api,es2api}.

Signed-off-by: Rhys Kidd 
---
 doxygen/glapi.doxy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
index 3290f84..0e169e4 100644
--- a/doxygen/glapi.doxy
+++ b/doxygen/glapi.doxy
@@ -9,7 +9,7 @@ PROJECT_NAME   = "Mesa GL API dispatcher"
 #---
 # configuration options related to the input files
 #---
-INPUT  = ../src/mesa/glapi/
+INPUT  = ../src/mapi/glapi/
 FILE_PATTERNS  = *.c *.h
 RECURSIVE  = NO
 EXCLUDE= 
@@ -46,4 +46,4 @@ TAGFILES   = main.tag=../core \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
  vbo.tag=vbo
-GENERATE_TAGFILE   = swrast.tag
+GENERATE_TAGFILE   = glapi.tag
-- 
2.5.0

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

[Mesa-dev] [PATCH 3/9] doxygen: Correct TAGFILE relative paths

2016-04-09 Thread Rhys Kidd 
Per Doxygen documentation, to combine external documentation (stored in
a *.tag file) with a project the TAGFILES option should be set in the
configuration file.

  A tag file typically only contains a relative location of the
  documentation from the point where doxygen was run. So when
  you include a tag file in other project you have to specify
  where the external documentation is located in relation this
  project.

  You can do this in the configuration file by assigning the
  (relative) location to the tag files specified after the
  TAGFILES configuration option.

  If you use a relative path it should be relative with respect
  to the directory where the HTML output of your project is
  generated; so a relative path from the HTML output directory
  of a project to the HTML output of the other project that is
  linked to.

Signed-off-by: Rhys Kidd 
---
 doxygen/gbm.doxy| 2 +-
 doxygen/glapi.doxy  | 2 +-
 doxygen/i965.doxy   | 2 +-
 doxygen/swrast.doxy | 2 +-
 doxygen/tnl.doxy| 4 ++--
 doxygen/tnl_dd.doxy | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doxygen/gbm.doxy b/doxygen/gbm.doxy
index 37e4aa0..d0f7f95 100644
--- a/doxygen/gbm.doxy
+++ b/doxygen/gbm.doxy
@@ -44,5 +44,5 @@ TAGFILES   = main.tag=../core \
  tnl_dd.tag=../tnl_dd \
  swrast_setup.tag=../gbm_setup \
  tnl.tag=../tnl \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = gbm.tag
diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
index 0e169e4..d4d967a 100644
--- a/doxygen/glapi.doxy
+++ b/doxygen/glapi.doxy
@@ -45,5 +45,5 @@ TAGFILES   = main.tag=../core \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = glapi.tag
diff --git a/doxygen/i965.doxy b/doxygen/i965.doxy
index a3aa2b6..014245e 100644
--- a/doxygen/i965.doxy
+++ b/doxygen/i965.doxy
@@ -46,5 +46,5 @@ TAGFILES   = glsl.tag=../glsl \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
  tnl_dd.tag=../tnl_dd \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = i965.tag
diff --git a/doxygen/swrast.doxy b/doxygen/swrast.doxy
index fa07afd..520764f 100644
--- a/doxygen/swrast.doxy
+++ b/doxygen/swrast.doxy
@@ -44,5 +44,5 @@ TAGFILES   = main.tag=../core \
  tnl_dd.tag=../tnl_dd \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = swrast.tag
diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index 85ef56c..09f5c1c 100644
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -44,6 +44,6 @@ TAGFILES   = tnl_dd.tag=../tnl \
  main.tag=../core \
  math.tag=../math \
  swrast.tag=../swrast \
- swrast_setup.tag=swrast_setup \
- vbo.tag=vbo
+ swrast_setup.tag=../swrast_setup \
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = tnl.tag
diff --git a/doxygen/tnl_dd.doxy b/doxygen/tnl_dd.doxy
index 5404f37..d8fed0a 100644
--- a/doxygen/tnl_dd.doxy
+++ b/doxygen/tnl_dd.doxy
@@ -44,5 +44,5 @@ TAGFILES   = main.tag=../core \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
- vbo.tag=vbo
+ vbo.tag=../vbo
 GENERATE_TAGFILE   = tnl_dd.tag
-- 
2.5.0

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

[Mesa-dev] [PATCH 7/9] doxygen: Correct TAGFILE linkage of main

2016-04-09 Thread Rhys Kidd 
core.doxy was renamed to main.doxy, along with output folder in
the below 2004 commit.

Correct the other modules' TAGFILE linkage to find the main folder.

  commit 3ef972f538e1ff207f5919a8068bf14af18fb270
  Author: Brian Paul 
  Date:   Sun May 16 22:07:02 2004 +

  Replaced 'core' with 'main'.
  Other minor updates.

Signed-off-by: Rhys Kidd 
---
 doxygen/gbm.doxy  | 2 +-
 doxygen/glapi.doxy| 2 +-
 doxygen/math.doxy | 2 +-
 doxygen/swrast.doxy   | 2 +-
 doxygen/swrast_setup.doxy | 2 +-
 doxygen/tnl.doxy  | 2 +-
 doxygen/tnl_dd.doxy   | 2 +-
 doxygen/vbo.doxy  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doxygen/gbm.doxy b/doxygen/gbm.doxy
index 8cfe98a..537d682 100644
--- a/doxygen/gbm.doxy
+++ b/doxygen/gbm.doxy
@@ -39,7 +39,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = main.tag=../core \
+TAGFILES   = main.tag=../main \
  math.tag=../math \
  tnl_dd.tag=../tnl_dd \
  swrast_setup.tag=../swrast_setup \
diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
index d4d967a..10046b9 100644
--- a/doxygen/glapi.doxy
+++ b/doxygen/glapi.doxy
@@ -39,7 +39,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = main.tag=../core \
+TAGFILES   = main.tag=../main \
  math.tag=../math \
  tnl_dd.tag=../tnl_dd \
  swrast.tag=../swrast \
diff --git a/doxygen/math.doxy b/doxygen/math.doxy
index 388af40..b260112 100644
--- a/doxygen/math.doxy
+++ b/doxygen/math.doxy
@@ -41,7 +41,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---
 TAGFILES   = tnl_dd.tag=../tnl_dd \
- main.tag=../core \
+ main.tag=../main \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
diff --git a/doxygen/swrast.doxy b/doxygen/swrast.doxy
index 520764f..cbab130 100644
--- a/doxygen/swrast.doxy
+++ b/doxygen/swrast.doxy
@@ -39,7 +39,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = main.tag=../core \
+TAGFILES   = main.tag=../main \
  math.tag=../math \
  tnl_dd.tag=../tnl_dd \
  swrast_setup.tag=../swrast_setup \
diff --git a/doxygen/swrast_setup.doxy b/doxygen/swrast_setup.doxy
index ee6f3ff..3141476 100644
--- a/doxygen/swrast_setup.doxy
+++ b/doxygen/swrast_setup.doxy
@@ -41,7 +41,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---
 TAGFILES   = tnl_dd.tag=../tnl_dd \
- main.tag=../core \
+ main.tag=../main \
  math.tag=../math \
  swrast.tag=../swrast \
  tnl.tag=../tnl \
diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index 09f5c1c..b985b8d 100644
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -41,7 +41,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---
 TAGFILES   = tnl_dd.tag=../tnl \
- main.tag=../core \
+ main.tag=../main \
  math.tag=../math \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
diff --git a/doxygen/tnl_dd.doxy b/doxygen/tnl_dd.doxy
index d8fed0a..172e46f 100644
--- a/doxygen/tnl_dd.doxy
+++ b/doxygen/tnl_dd.doxy
@@ -39,7 +39,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---
 # Configuration::addtions related to external references   
 #---
-TAGFILES   = main.tag=../core \
+TAGFILES   = main.tag=../main \
  math.tag=../math \
  swrast.t

[Mesa-dev] [PATCH 4/9] doxygen: Fix doxygen/gbm.doxy TAGFILES

2016-04-09 Thread Rhys Kidd 
There has never been a doxygen/gbm_setup output folder.

Appears to have been a copy-paste error from original commit
in 245341f406bbdf23fec3d8ea8ad95c147c11ad1c.

Signed-off-by: Rhys Kidd 
---
 doxygen/gbm.doxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxygen/gbm.doxy b/doxygen/gbm.doxy
index d0f7f95..8cfe98a 100644
--- a/doxygen/gbm.doxy
+++ b/doxygen/gbm.doxy
@@ -42,7 +42,7 @@ SKIP_FUNCTION_MACROS   = YES
 TAGFILES   = main.tag=../core \
  math.tag=../math \
  tnl_dd.tag=../tnl_dd \
- swrast_setup.tag=../gbm_setup \
+ swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl \
  vbo.tag=../vbo
 GENERATE_TAGFILE   = gbm.tag
-- 
2.5.0

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

[Mesa-dev] [PATCH 6/9] doxygen: Update .gitignore

2016-04-09 Thread Rhys Kidd 
The last of these output directories was removed in 2007.

  commit c2e0570831ae130fce1fa374bebe25bb9c561e29
  Author: Jerome Glisse 
  Date:   Fri Feb 16 23:18:56 2007 +0100

  Update doxygen doc to reflet vbo changes.

  Update doxygen doc, array_cache no longuer exist,
  new shiny vbo modules is there. Tested on unix,
  but i think i didn't broke that bat :).

  commit 3ef972f538e1ff207f5919a8068bf14af18fb270
  Author: Brian Paul 
  Date:   Sun May 16 22:07:02 2004 +

  Replaced 'core' with 'main'.
  Other minor updates.

  commit 69db632a9df035cdc852cc64fb14038919929a70
  Author: Jose Fonseca 
  Date:   Thu May 1 23:32:54 2003 +

  Move the Doxygen configuration files into the usual places and integrate 
with the build system.

Signed-off-by: Rhys Kidd 
---
 doxygen/.gitignore | 5 -
 1 file changed, 5 deletions(-)

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index ddb2093..ea67dd5 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -1,9 +1,6 @@
 *.db
 *.tag
 *.tmp
-agpgart
-array_cache
-core
 core_subset
 gallium
 gbm
@@ -13,8 +10,6 @@ i965
 main
 math
 math_subset
-radeondrm
-radeonfb
 radeon_subset
 swrast
 swrast_setup
-- 
2.5.0

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

[Mesa-dev] [PATCH 1/9] doxygen: Remove src/mesa/shader/ references

2016-04-09 Thread Rhys Kidd 
Mesa has not had a src/mesa/shader/ folder since Mesa 7.9 removed it
in October 2010, as part of a revised GLSL compiler written by Intel.

Remove doxygen/shader.doxy and consequential changes made throughout.

In addition to removing an unnecessary Doxygen doxyfile, this change also
avoids a bug in the consolidated Doxygen output caused by
doxygen/shader.doxy inadvertently overwriting doxygen/swrast.tag via its
GENERATE_TAGFILE setting.

This bug depended upon the specific order each *.tag was built.

Signed-off-by: Rhys Kidd 
---
 doxygen/.gitignore  |  1 -
 doxygen/Makefile|  1 -
 doxygen/doxy.bat|  2 --
 doxygen/header.html |  1 -
 doxygen/main.doxy   |  1 -
 doxygen/shader.doxy | 49 -
 doxygen/tnl.doxy|  1 -
 doxygen/tnl_dd.doxy |  1 -
 doxygen/vbo.doxy|  1 -
 9 files changed, 58 deletions(-)
 delete mode 100644 doxygen/shader.doxy

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index a5f3921..1c186cb 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -17,7 +17,6 @@ miniglx
 radeondrm
 radeonfb
 radeon_subset
-shader
 swrast
 swrast_setup
 tnl
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 01c2691..b1bc15d 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -12,7 +12,6 @@ FULL = \
vbo.doxy \
glapi.doxy \
glsl.doxy \
-   shader.doxy \
swrast.doxy \
swrast_setup.doxy \
tnl.doxy \
diff --git a/doxygen/doxy.bat b/doxygen/doxy.bat
index 331b931..e566ca3 100644
--- a/doxygen/doxy.bat
+++ b/doxygen/doxy.bat
@@ -6,7 +6,6 @@ doxygen swrast_setup.doxy
 doxygen tnl.doxy
 doxygen core.doxy
 doxygen glapi.doxy
-doxygen shader.doxy
 
 echo Building again, to resolve tags
 doxygen tnl_dd.doxy
@@ -16,4 +15,3 @@ doxygen swrast.doxy
 doxygen swrast_setup.doxy
 doxygen tnl.doxy
 doxygen glapi.doxy
-doxygen shader.doxy
diff --git a/doxygen/header.html b/doxygen/header.html
index abd736f..034231c 100644
--- a/doxygen/header.html
+++ b/doxygen/header.html
@@ -10,7 +10,6 @@
 glsl |
 vbo |
 math |
-shader |
 swrast |
 swrast_setup |
 tnl |
diff --git a/doxygen/main.doxy b/doxygen/main.doxy
index c258031..0edcefa 100644
--- a/doxygen/main.doxy
+++ b/doxygen/main.doxy
@@ -43,7 +43,6 @@ TAGFILES  = tnl_dd.tag=../tnl_dd \
 vbo.tag=../vbo \
  glapi.tag=../glapi \
  math.tag=../math \
- shader.tag=../shader \
  swrast.tag=../swrast \
  swrast_setup.tag=../swrast_setup \
  tnl.tag=../tnl
diff --git a/doxygen/shader.doxy b/doxygen/shader.doxy
deleted file mode 100644
index d8ad14c..000
--- a/doxygen/shader.doxy
+++ /dev/null
@@ -1,49 +0,0 @@
-# Doxyfile 0.1
-
-@INCLUDE   = common.doxy
-
-#---
-# General configuration options
-#---
-PROJECT_NAME   = "Mesa Vertex and Fragment Program code"
-#---
-# configuration options related to the input files
-#---
-INPUT  = ../src/mesa/shader/
-FILE_PATTERNS  = *.c *.h
-RECURSIVE  = NO
-EXCLUDE= 
-EXCLUDE_PATTERNS   = 
-EXAMPLE_PATH   = 
-EXAMPLE_PATTERNS   = 
-EXAMPLE_RECURSIVE  = NO
-IMAGE_PATH = 
-INPUT_FILTER   = 
-FILTER_SOURCE_FILES= NO
-#---
-# configuration options related to the HTML output
-#---
-HTML_OUTPUT= shader
-#---
-# Configuration options related to the preprocessor   
-#---
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION= NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES= YES
-INCLUDE_PATH   = ../include/
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED = 
-EXPAND_AS_DEFINED  = 
-SKIP_FUNCTION_MACROS   = YES
-#---
-# Configuration::addtions related to external references   
-#---
-TAGFILES   = main.tag=../core \
- math.tag=../math \
- tnl_dd.tag=../tnl_dd \
- swrast.tag=../swrast \
- swrast_setup.tag=../swrast_setup \
- tnl.tag=../tnl \
- vbo.tag=vbo
-GENERATE_TAGFILE   = swrast.tag
diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index a4f7

[Mesa-dev] [PATCH 0/9] doxygen: Clean up configuration file bit rot

2016-04-09 Thread Rhys Kidd 
So this patchset is an effort to clean up the doxygen documentation bit rot.

Changes:
- Remove legacy *.doxy from intermediate TAGFILE linkage and .gitignore.
- Correct a relative path issue with .../vbo that has been copy pasted around.
- Remove deprecated doxygen settings from common.doxy.
- General tidy up given some files haven't been touched in c.10 years.

If anyone's documentation workflow depends on these assumption holding, please
shout out. Although, in that case there's more likely a tweak to your workflow
that's required.

Copying Sarah Sharp (Intel) and Elie Tournier given recent work in this area.
Hopefully also assists in getting the right eyes reviewing the patchset.

Rhys Kidd (9):
  doxygen: Remove src/mesa/shader/ references
  doxygen: Fix doxygen/glapi.doxy
  doxygen: Correct TAGFILE relative paths
  doxygen: Fix doxygen/gbm.doxy TAGFILES
  doxygen: Remove references to miniglx
  doxygen: Update .gitignore
  doxygen: Correct TAGFILE linkage of main
  doxygen: Fix typo in doxygen/tnl.doxy
  doxygen: Remove deprecated settings in common.doxy

 doxygen/.gitignore |  7 ---
 doxygen/Makefile   |  1 -
 doxygen/common.doxy| 51 --
 doxygen/core_subset.doxy   |  3 +--
 doxygen/doxy.bat   |  2 --
 doxygen/gbm.doxy   |  6 +++---
 doxygen/glapi.doxy |  8 
 doxygen/header.html|  1 -
 doxygen/header_subset.html |  1 -
 doxygen/i965.doxy  |  2 +-
 doxygen/main.doxy  |  1 -
 doxygen/math.doxy  |  2 +-
 doxygen/radeon_subset.doxy |  3 +--
 doxygen/shader.doxy| 49 
 doxygen/swrast.doxy|  4 ++--
 doxygen/swrast_setup.doxy  |  2 +-
 doxygen/tnl.doxy   |  9 
 doxygen/tnl_dd.doxy|  5 ++---
 doxygen/vbo.doxy   |  3 +--
 19 files changed, 21 insertions(+), 139 deletions(-)
 delete mode 100644 doxygen/shader.doxy

-- 
2.5.0

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

Re: [Mesa-dev] Updating mesa3d.org docs?

2016-04-09 Thread Rhys Kidd 
On 9 April 2016 at 16:19, Brian Paul  wrote:

> On 04/09/2016 01:09 PM, Rhys Kidd wrote:
>
>> On Thursday, October 15, 2015, Brian Paul > > wrote:
>>
>> On 10/15/2015 01:18 PM, Sarah Sharp wrote:
>>
>> Hi Brian!
>>
>>
>> Hi Sarah,
>>
>>
>> I'm a new Mesa developer in Intel's OTC graphics team (although
>> not new
>> to open source, I've been a Linux kernel developer for the last
>> seven
>> years).
>>
>> I heard that you're responsible for updating mesa3d.org
>> <
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__mesa3d.org&d=BQMFaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8&m=2U9kWir1cBYA05OdS3Zeeks1wPxuSOcnsf-ajjN8M3I&s=snUhIuiDJwuTupwNo_RzgVx0GbxOEnLhAKIG1XTBYjg&e=
>> >
>> documentation
>> against the docs in the Mesa source code repo. I noticed the
>> docs are
>> out-of-date WRT the repo, and I had a couple questions:
>>
>> 1. What's the process for pushing updated documentation to the
>> site?
>>
>>
>> All the website pages are found in the git docs/ directory.  Changes
>> are submitted as patches and reviewed like code on the mesa-dev list.
>>
>>
>> 2. How often are updated docs pushed? Once every week, month, or
>> when
>>  there's a new Mesa version?
>>
>>
>> I push them whenever a new Mesa version is released, but I can do it
>> at any time on request.
>>
>>
>> Hello Brian,
>>
>> Now that Mesa 11.2 has been released, could you please push the docs to
>> mesa3d.org
>>
>
> I did a few days ago, but I guess I missed the envvars.html file.  It's
> there now.
>

Thanks Brian.

<
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__mesa3d.org&d=BQMFaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8&m=2U9kWir1cBYA05OdS3Zeeks1wPxuSOcnsf-ajjN8M3I&s=snUhIuiDJwuTupwNo_RzgVx0GbxOEnLhAKIG1XTBYjg&e=
>> >?
>>
>> A number of relevant changes, however my selfish interest is to see the
>> vc4 debug settings in envvars.html make the website. The number of vc4
>> users and developers running on the Mesa stack are increasing.
>>
>
> -Brian
>
>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] Updating mesa3d.org docs?

2016-04-09 Thread Brian Paul 

On 04/09/2016 01:09 PM, Rhys Kidd wrote:

On Thursday, October 15, 2015, Brian Paul mailto:bri...@vmware.com>> wrote:

On 10/15/2015 01:18 PM, Sarah Sharp wrote:

Hi Brian!


Hi Sarah,


I'm a new Mesa developer in Intel's OTC graphics team (although
not new
to open source, I've been a Linux kernel developer for the last
seven
years).

I heard that you're responsible for updating mesa3d.org


documentation
against the docs in the Mesa source code repo. I noticed the
docs are
out-of-date WRT the repo, and I had a couple questions:

1. What's the process for pushing updated documentation to the site?


All the website pages are found in the git docs/ directory.  Changes
are submitted as patches and reviewed like code on the mesa-dev list.


2. How often are updated docs pushed? Once every week, month, or
when
 there's a new Mesa version?


I push them whenever a new Mesa version is released, but I can do it
at any time on request.


Hello Brian,

Now that Mesa 11.2 has been released, could you please push the docs to
mesa3d.org


I did a few days ago, but I guess I missed the envvars.html file.  It's 
there now.




?

A number of relevant changes, however my selfish interest is to see the
vc4 debug settings in envvars.html make the website. The number of vc4
users and developers running on the Mesa stack are increasing.


-Brian


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

Re: [Mesa-dev] [PATCH] nir: Merge redudant integer clamping.

2016-04-09 Thread Jason Ekstrand 
On Apr 9, 2016 11:05 AM, "Kenneth Graunke"  wrote:
>
> On Saturday, April 9, 2016 3:31:16 AM PDT Markus Wick wrote:
> > Dolphin uses them a lot. Range tracking would be better in the long
term,
> > but this two lines works fine for now.
>
> these four lines
>
> Reviewed-by: Kenneth Graunke 
>
> Thanks for fixing this!  I can push the patch for you in a day or two
> assuming nobody else has feedback.

LGTM.  Of course, shader-db numbers would be nice.

> > Signed-off-by: Markus Wick 
> > ---
> >  src/compiler/nir/nir_opt_algebraic.py | 5 -
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/
> nir_opt_algebraic.py
> > index e72b4a7..31d7655 100644
> > --- a/src/compiler/nir/nir_opt_algebraic.py
> > +++ b/src/compiler/nir/nir_opt_algebraic.py
> > @@ -137,7 +137,10 @@ optimizations = [
> > (('~fmax', ('fmin', a, 1.0), 0.0), ('fsat', a),
'!options->lower_fsat'),
> > (('fsat', a), ('fmin', ('fmax', a, 0.0), 1.0),
'options->lower_fsat'),
> > (('fsat', ('fsat', a)), ('fsat', a)),
> > -   (('fmin', ('fmax', ('fmin', ('fmax', a, 0.0), 1.0), 0.0), 1.0),
('fmin',
> ('fmax', a, 0.0), 1.0)),
> > +   (('fmin', ('fmax', ('fmin', ('fmax', a, b), c), b), c), ('fmin',
> ('fmax', a, b), c)),
> > +   (('imin', ('imax', ('imin', ('imax', a, b), c), b), c), ('imin',
> ('imax', a, b), c)),
> > +   (('umin', ('umax', ('umin', ('umax', a, b), c), b), c), ('umin',
> ('umax', a, b), c)),
> > +   (('extract_u8', ('imin', ('imax', a, 0), 0xff), 0), ('imin',
('imax', a,
> 0), 0xff)),
> > (('~ior', ('flt', a, b), ('flt', a, c)), ('flt', a, ('fmax', b,
c))),
> > (('~ior', ('flt', a, c), ('flt', b, c)), ('flt', ('fmin', a, b),
c)),
> > (('~ior', ('fge', a, b), ('fge', a, c)), ('fge', a, ('fmin', b,
c))),
> >
>
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] Updating mesa3d.org docs?

2016-04-09 Thread Rhys Kidd 
On Thursday, October 15, 2015, Brian Paul  wrote:

> On 10/15/2015 01:18 PM, Sarah Sharp wrote:
>
>> Hi Brian!
>>
>
> Hi Sarah,
>
>
> I'm a new Mesa developer in Intel's OTC graphics team (although not new
>> to open source, I've been a Linux kernel developer for the last seven
>> years).
>>
>> I heard that you're responsible for updating mesa3d.org documentation
>> against the docs in the Mesa source code repo. I noticed the docs are
>> out-of-date WRT the repo, and I had a couple questions:
>>
>> 1. What's the process for pushing updated documentation to the site?
>>
>
> All the website pages are found in the git docs/ directory.  Changes are
> submitted as patches and reviewed like code on the mesa-dev list.
>
>
> 2. How often are updated docs pushed? Once every week, month, or when
>> there's a new Mesa version?
>>
>
> I push them whenever a new Mesa version is released, but I can do it at
> any time on request.
>
>
Hello Brian,

Now that Mesa 11.2 has been released, could you please push the docs to
mesa3d.org?

A number of relevant changes, however my selfish interest is to see the vc4
debug settings in envvars.html make the website. The number of vc4 users
and developers running on the Mesa stack are increasing.

Thanks in advance,
Rhys

3. Any chance I could get permissions to push updated docs?  I'll be
>> improving Mesa documentation as part of my new job, and I would love
>> to be able to push myself once patches are accepted, rather than
>> having to ping you.
>>
>
> The typical deal is we wait until a person has some track record of
> producing good patches before giving git-write/push privileges.
>
> So, I'd suggest you make some changes/patches, post them to the mesa-dev
> list for review (others can push them for you initially), and then when
> you've got some history established you can file a request (via bugzilla)
> for git privileges.
>
> -Brian
>
> ___
> 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
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] mesa: typecast arguments to printf to avoid 32-bit warnings

2016-04-09 Thread Ilia Mirkin 
ping?

On Sun, Apr 3, 2016 at 9:57 PM, Ilia Mirkin  wrote:
> Signed-off-by: Ilia Mirkin 
> ---
>  src/mesa/main/bufferobj.c | 3 ++-
>  src/mesa/vbo/vbo_exec_array.c | 8 
>  2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
> index 731b62e..9a59043 100644
> --- a/src/mesa/main/bufferobj.c
> +++ b/src/mesa/main/bufferobj.c
> @@ -3750,7 +3750,8 @@ _mesa_BindBufferRange(GLenum target, GLuint index,
>
> if (MESA_VERBOSE & VERBOSE_API) {
>_mesa_debug(ctx, "glBindBufferRange(%s, %u, %u, %ld, %ld)\n",
> -  _mesa_enum_to_string(target), index, buffer, offset, size);
> +  _mesa_enum_to_string(target), index, buffer,
> +  (long)offset, (long)size);
> }
>
> if (buffer == 0) {
> diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
> index 40cf3ff..88a7b9c 100644
> --- a/src/mesa/vbo/vbo_exec_array.c
> +++ b/src/mesa/vbo/vbo_exec_array.c
> @@ -1659,8 +1659,8 @@ vbo_exec_MultiDrawArraysIndirectCount(GLenum mode,
> if (MESA_VERBOSE & VERBOSE_DRAW)
>_mesa_debug(ctx, "glMultiDrawArraysIndirectCountARB"
>"(%s, %lx, %lx, %i, %i)\n",
> -  _mesa_enum_to_string(mode), indirect,
> -  drawcount, maxdrawcount, stride);
> +  _mesa_enum_to_string(mode), (long)indirect,
> +  (long)drawcount, maxdrawcount, stride);
>
> /* If  is zero, the array elements are treated as tightly packed. 
> */
> if (stride == 0)
> @@ -1688,8 +1688,8 @@ vbo_exec_MultiDrawElementsIndirectCount(GLenum mode, 
> GLenum type,
>_mesa_debug(ctx, "glMultiDrawElementsIndirectCountARB"
>"(%s, %s, %lx, %lx, %i, %i)\n",
>_mesa_enum_to_string(mode),
> -  _mesa_enum_to_string(type), indirect,
> -  drawcount, maxdrawcount, stride);
> +  _mesa_enum_to_string(type), (long)indirect,
> +  (long)drawcount, maxdrawcount, stride);
>
> /* If  is zero, the array elements are treated as tightly packed. 
> */
> if (stride == 0)
> --
> 2.7.3
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] nir: Merge redudant integer clamping.

2016-04-09 Thread Kenneth Graunke 
On Saturday, April 9, 2016 3:31:16 AM PDT Markus Wick wrote:
> Dolphin uses them a lot. Range tracking would be better in the long term,
> but this two lines works fine for now.

these four lines

Reviewed-by: Kenneth Graunke 

Thanks for fixing this!  I can push the patch for you in a day or two
assuming nobody else has feedback.

> Signed-off-by: Markus Wick 
> ---
>  src/compiler/nir/nir_opt_algebraic.py | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/
nir_opt_algebraic.py
> index e72b4a7..31d7655 100644
> --- a/src/compiler/nir/nir_opt_algebraic.py
> +++ b/src/compiler/nir/nir_opt_algebraic.py
> @@ -137,7 +137,10 @@ optimizations = [
> (('~fmax', ('fmin', a, 1.0), 0.0), ('fsat', a), '!options->lower_fsat'),
> (('fsat', a), ('fmin', ('fmax', a, 0.0), 1.0), 'options->lower_fsat'),
> (('fsat', ('fsat', a)), ('fsat', a)),
> -   (('fmin', ('fmax', ('fmin', ('fmax', a, 0.0), 1.0), 0.0), 1.0), ('fmin', 
('fmax', a, 0.0), 1.0)),
> +   (('fmin', ('fmax', ('fmin', ('fmax', a, b), c), b), c), ('fmin', 
('fmax', a, b), c)),
> +   (('imin', ('imax', ('imin', ('imax', a, b), c), b), c), ('imin', 
('imax', a, b), c)),
> +   (('umin', ('umax', ('umin', ('umax', a, b), c), b), c), ('umin', 
('umax', a, b), c)),
> +   (('extract_u8', ('imin', ('imax', a, 0), 0xff), 0), ('imin', ('imax', a, 
0), 0xff)),
> (('~ior', ('flt', a, b), ('flt', a, c)), ('flt', a, ('fmax', b, c))),
> (('~ior', ('flt', a, c), ('flt', b, c)), ('flt', ('fmin', a, b), c)),
> (('~ior', ('fge', a, b), ('fge', a, c)), ('fge', a, ('fmin', b, c))),
> 



signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 94394] Compile Mesa , specific compilation , /usr/bin/ld: cannot find -ldrm

2016-04-09 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=94394

--- Comment #6 from tele  ---
 Thanks people !

problem SOLVED

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are the assignee for the bug.___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 94805] Compile Mesa , specific compilation , error: LLVM is required to build Gallium

2016-04-09 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=94805

tele  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |INVALID

--- Comment #5 from tele  ---
It working !
  Thanks Pierre !  :D

Problem   SOLVED

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are the QA Contact for the bug.___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] glsl: allow usage of the keyword buffer before GLSL 430 / ESSL 310

2016-04-09 Thread Ilia Mirkin 
The GLSL 4.20 and ESSL 3.00 specs don't list 'buffer' as a reserved
keyword. Make the parser ignore it unless GLSL 4.30 / ESSL 3.10 are
used, or ARB_shader_storage_buffer_objects is enabled.

Signed-off-by: Ilia Mirkin 
Cc: mesa-sta...@lists.freedesktop.org
---
 src/compiler/glsl/glsl_lexer.ll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 0b7695f..6b1ef17 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -304,7 +304,7 @@ in  return IN_TOK;
 outreturn OUT_TOK;
 inout  return INOUT_TOK;
 uniformreturn UNIFORM;
-buffer return BUFFER;
+buffer KEYWORD_WITH_ALT(0, 0, 430, 310, 
yyextra->ARB_shader_storage_buffer_object_enable, BUFFER);
 varyingDEPRECATED_ES_KEYWORD(VARYING);
 centroid   KEYWORD(120, 300, 120, 300, CENTROID);
 invariant  KEYWORD(120, 100, 120, 100, INVARIANT);
-- 
2.7.3

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

[Mesa-dev] [Bug 94805] Compile Mesa , specific compilation , error: LLVM is required to build Gallium

2016-04-09 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=94805

--- Comment #4 from Pierre Moreau  ---
In your command line for building Mesa, you should change
`--with-llvm-prefix=/usr/local/bin` to `--with-llvm-prefix=/usr/local` as it
changes where the *root* folder of your llvm installation is, not the folder
where it will find the llvm binaries.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are the assignee for the bug.___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 94805] Compile Mesa , specific compilation , error: LLVM is required to build Gallium

2016-04-09 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=94805

tele  changed:

   What|Removed |Added

 Resolution|INVALID |---
 Status|RESOLVED|REOPENED

--- Comment #3 from tele  ---
I Re Open, because I need all drivers,
   so I need find way how compile LLVM for Mesa.

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are the QA Contact for the bug.___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 3/3] i965/disasm: Decode per-slot offsets.

2016-04-09 Thread Ben Widawsky 
On Fri, Apr 08, 2016 at 01:57:44PM -0700, Kenneth Graunke wrote:
> We just never bothered to decode this.
> 
> Signed-off-by: Kenneth Graunke 

Series is:
Reviewed-by: Ben Widawsky 
> ---
>  src/mesa/drivers/dri/i965/brw_disasm.c | 5 +
>  1 file changed, 5 insertions(+)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c 
> b/src/mesa/drivers/dri/i965/brw_disasm.c
> index 0848657..88bd7a4 100644
> --- a/src/mesa/drivers/dri/i965/brw_disasm.c
> +++ b/src/mesa/drivers/dri/i965/brw_disasm.c
> @@ -1517,6 +1517,11 @@ brw_disassemble_inst(FILE *file, const struct 
> brw_device_info *devinfo,
>   : gen5_urb_opcode,
> opcode, &space);
>  
> +if (devinfo->gen >= 7 &&
> +brw_inst_urb_per_slot_offset(devinfo, inst)) {
> +   string(file, " per-slot");
> +}
> +
>  if (opcode == GEN8_URB_OPCODE_SIMD8_WRITE ||
>  opcode == GEN8_URB_OPCODE_SIMD8_READ) {
> if (brw_inst_urb_channel_mask_present(devinfo, inst))
> -- 
> 2.8.0
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATH v2] doxygen: Generate Doxygen for NIR

2016-04-09 Thread Rhys Kidd 
LGTM,

Reviewed-by: Rhys Kidd 

On Saturday, April 9, 2016, Elie TOURNIER  wrote:

> Now, one can do the following to generate and read the nir Doxygen:
> cd $MESA_TOP/doxygen
> make
> firefox nir/index.html
>
> Update v2:
> Correct TAGFILES in nir.doxy
>
> Signed-off-by: Elie TOURNIER >
> ---
>  doxygen/.gitignore  |  1 +
>  doxygen/Makefile|  3 ++-
>  doxygen/header.html |  1 +
>  doxygen/nir.doxy| 50
> ++
>  4 files changed, 54 insertions(+), 1 deletion(-)
>  create mode 100644 doxygen/nir.doxy
>
> diff --git a/doxygen/.gitignore b/doxygen/.gitignore
> index a5f3921..ed94bed 100644
> --- a/doxygen/.gitignore
> +++ b/doxygen/.gitignore
> @@ -14,6 +14,7 @@ main
>  math
>  math_subset
>  miniglx
> +nir
>  radeondrm
>  radeonfb
>  radeon_subset
> diff --git a/doxygen/Makefile b/doxygen/Makefile
> index 01c2691..cbbb40e 100644
> --- a/doxygen/Makefile
> +++ b/doxygen/Makefile
> @@ -18,7 +18,8 @@ FULL = \
> tnl.doxy \
> tnl_dd.doxy \
> gbm.doxy \
> -   i965.doxy
> +   i965.doxy \
> +   nir.doxy
>
>  full: $(FULL:.doxy=.tag)
> $(foreach FILE,$(FULL),doxygen $(FILE);)
> diff --git a/doxygen/header.html b/doxygen/header.html
> index abd736f..8e656c1 100644
> --- a/doxygen/header.html
> +++ b/doxygen/header.html
> @@ -8,6 +8,7 @@
>  core |
>  glapi |
>  glsl |
> +nir |
>  vbo |
>  math |
>  shader |
> diff --git a/doxygen/nir.doxy b/doxygen/nir.doxy
> new file mode 100644
> index 000..cad7380
> --- /dev/null
> +++ b/doxygen/nir.doxy
> @@ -0,0 +1,50 @@
> +# Doxyfile 0.1
> +
> +@INCLUDE   = common.doxy
> +
>
> +#---
> +# General configuration options
>
> +#---
> +PROJECT_NAME   = "Mesa NIR module"
>
> +#---
> +# Configuration options related to the input files
>
> +#---
> +INPUT  = ../src/compiler/nir
> +FILE_PATTERNS  = *.c *.cpp *.h
> +RECURSIVE  = NO
> +EXCLUDE=
> +EXCLUDE_PATTERNS   =
> +EXAMPLE_PATH   =
> +EXAMPLE_PATTERNS   =
> +EXAMPLE_RECURSIVE  = NO
> +IMAGE_PATH =
> +INPUT_FILTER   =
> +FILTER_SOURCE_FILES= NO
>
> +#---
> +# Configuration options related to the HTML output
>
> +#---
> +HTML_OUTPUT= nir
>
> +#---
> +# Configuration options related to the preprocessor
>
> +#---
> +ENABLE_PREPROCESSING   = YES
> +MACRO_EXPANSION= NO
> +EXPAND_ONLY_PREDEF = NO
> +SEARCH_INCLUDES= YES
> +INCLUDE_PATH   = ../include/
> +INCLUDE_FILE_PATTERNS  =
> +PREDEFINED =
> +EXPAND_AS_DEFINED  =
> +SKIP_FUNCTION_MACROS   = YES
>
> +#---
> +# Configuration::additions related to external references
>
> +#---
> +TAGFILES   = glsl.tag=../glsl \
> + main.tag=../main \
> + math.tag=../math \
> + swrast.tag=../swrast \
> + swrast_setup.tag=../swrast_setup \
> + tnl.tag=../tnl \
> + tnl_dd.tag=../tnl_dd \
> + vbo.tag=../vbo
> +GENERATE_TAGFILE   = nir.tag
> --
> 1.9.1
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org 
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATH v2] doxygen: Generate Doxygen for NIR

2016-04-09 Thread Elie TOURNIER 
Now, one can do the following to generate and read the nir Doxygen:
cd $MESA_TOP/doxygen
make
firefox nir/index.html

Update v2:
Correct TAGFILES in nir.doxy

Signed-off-by: Elie TOURNIER 
---
 doxygen/.gitignore  |  1 +
 doxygen/Makefile|  3 ++-
 doxygen/header.html |  1 +
 doxygen/nir.doxy| 50 ++
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 doxygen/nir.doxy

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index a5f3921..ed94bed 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -14,6 +14,7 @@ main
 math
 math_subset
 miniglx
+nir
 radeondrm
 radeonfb
 radeon_subset
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 01c2691..cbbb40e 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -18,7 +18,8 @@ FULL = \
tnl.doxy \
tnl_dd.doxy \
gbm.doxy \
-   i965.doxy
+   i965.doxy \
+   nir.doxy
 
 full: $(FULL:.doxy=.tag)
$(foreach FILE,$(FULL),doxygen $(FILE);)
diff --git a/doxygen/header.html b/doxygen/header.html
index abd736f..8e656c1 100644
--- a/doxygen/header.html
+++ b/doxygen/header.html
@@ -8,6 +8,7 @@
 core |
 glapi |
 glsl |
+nir |
 vbo |
 math |
 shader |
diff --git a/doxygen/nir.doxy b/doxygen/nir.doxy
new file mode 100644
index 000..cad7380
--- /dev/null
+++ b/doxygen/nir.doxy
@@ -0,0 +1,50 @@
+# Doxyfile 0.1
+
+@INCLUDE   = common.doxy
+
+#---
+# General configuration options
+#---
+PROJECT_NAME   = "Mesa NIR module"
+#---
+# Configuration options related to the input files
+#---
+INPUT  = ../src/compiler/nir
+FILE_PATTERNS  = *.c *.cpp *.h
+RECURSIVE  = NO
+EXCLUDE=
+EXCLUDE_PATTERNS   =
+EXAMPLE_PATH   =
+EXAMPLE_PATTERNS   =
+EXAMPLE_RECURSIVE  = NO
+IMAGE_PATH =
+INPUT_FILTER   =
+FILTER_SOURCE_FILES= NO
+#---
+# Configuration options related to the HTML output
+#---
+HTML_OUTPUT= nir
+#---
+# Configuration options related to the preprocessor
+#---
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION= NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES= YES
+INCLUDE_PATH   = ../include/
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED =
+EXPAND_AS_DEFINED  =
+SKIP_FUNCTION_MACROS   = YES
+#---
+# Configuration::additions related to external references
+#---
+TAGFILES   = glsl.tag=../glsl \
+ main.tag=../main \
+ math.tag=../math \
+ swrast.tag=../swrast \
+ swrast_setup.tag=../swrast_setup \
+ tnl.tag=../tnl \
+ tnl_dd.tag=../tnl_dd \
+ vbo.tag=../vbo
+GENERATE_TAGFILE   = nir.tag
-- 
1.9.1

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

Re: [Mesa-dev] [PATCH] doxygen: Generate Doxygen for NIR

2016-04-09 Thread Rhys Kidd 
Hello Elie,

On 9 April 2016 at 08:50, Elie TOURNIER  wrote:

> Now, one can do the following to generate and read the nir Doxygen:
> cd $MESA_TOP/doxygen
> make
> firefox nir/index.html
>
> Signed-off-by: Elie TOURNIER 
> ---
>  doxygen/.gitignore  |  1 +
>  doxygen/Makefile|  3 ++-
>  doxygen/header.html |  1 +
>  doxygen/nir.doxy| 50
> ++
>  4 files changed, 54 insertions(+), 1 deletion(-)
>  create mode 100644 doxygen/nir.doxy
>
> diff --git a/doxygen/.gitignore b/doxygen/.gitignore
> index a5f3921..ed94bed 100644
> --- a/doxygen/.gitignore
> +++ b/doxygen/.gitignore
> @@ -14,6 +14,7 @@ main
>  math
>  math_subset
>  miniglx
> +nir
>  radeondrm
>  radeonfb
>  radeon_subset
> diff --git a/doxygen/Makefile b/doxygen/Makefile
> index 01c2691..cbbb40e 100644
> --- a/doxygen/Makefile
> +++ b/doxygen/Makefile
> @@ -18,7 +18,8 @@ FULL = \
> tnl.doxy \
> tnl_dd.doxy \
> gbm.doxy \
> -   i965.doxy
> +   i965.doxy \
> +   nir.doxy
>
>  full: $(FULL:.doxy=.tag)
> $(foreach FILE,$(FULL),doxygen $(FILE);)
> diff --git a/doxygen/header.html b/doxygen/header.html
> index abd736f..8e656c1 100644
> --- a/doxygen/header.html
> +++ b/doxygen/header.html
> @@ -8,6 +8,7 @@
>  core |
>  glapi |
>  glsl |
> +nir |
>  vbo |
>  math |
>  shader |
> diff --git a/doxygen/nir.doxy b/doxygen/nir.doxy
> new file mode 100644
> index 000..7e431ac
> --- /dev/null
> +++ b/doxygen/nir.doxy
> @@ -0,0 +1,50 @@
> +# Doxyfile 0.1
> +
> +@INCLUDE   = common.doxy
> +
>
> +#---
> +# General configuration options
>
> +#---
> +PROJECT_NAME   = "Mesa NIR module"
>
> +#---
> +# Configuration options related to the input files
>
> +#---
> +INPUT  = ../src/compiler/nir
> +FILE_PATTERNS  = *.c *.cpp *.h
> +RECURSIVE  = NO
> +EXCLUDE=
> +EXCLUDE_PATTERNS   =
> +EXAMPLE_PATH   =
> +EXAMPLE_PATTERNS   =
> +EXAMPLE_RECURSIVE  = NO
> +IMAGE_PATH =
> +INPUT_FILTER   =
> +FILTER_SOURCE_FILES= NO
>
> +#---
> +# Configuration options related to the HTML output
>
> +#---
> +HTML_OUTPUT= nir
>
> +#---
> +# Configuration options related to the preprocessor
>
> +#---
> +ENABLE_PREPROCESSING   = YES
> +MACRO_EXPANSION= NO
> +EXPAND_ONLY_PREDEF = NO
> +SEARCH_INCLUDES= YES
> +INCLUDE_PATH   = ../include/
> +INCLUDE_FILE_PATTERNS  =
> +PREDEFINED =
> +EXPAND_AS_DEFINED  =
> +SKIP_FUNCTION_MACROS   = YES
>
> +#---
> +# Configuration::additions related to external references
>
> +#---
> +TAGFILES   = glsl.tag=../glsl \
> + main.tag=../main \
> + math.tag=../math \
> + swrast.tag=../swrast \
> + swrast_setup.tag=../swrast_setup \
> + tnl.tag=../tnl \
> + tnl_dd.tag=../tnl_dd \
> + vbo.tag=vbo
>

With the above line replaced with 'vbo.tag=../vbo' that patch would get my:

Reviewed-by: Rhys Kidd 

I'm about to publish a set of patches that make that correction throughout
$MESA_TOP/doxygen, however no point adding another incorrect one while
you're at it.


> +GENERATE_TAGFILE   = nir.tag
> --
> 1.9.1
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH v2] doxygen: update glsl link

2016-04-09 Thread Rhys Kidd 
On 7 April 2016 at 17:21, Elie TOURNIER  wrote:

> Signed-off-by: Elie TOURNIER 
> ---
>  doxygen/glsl.doxy | 9 +
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/doxygen/glsl.doxy b/doxygen/glsl.doxy
> index 9915ba2..ef71a4a 100644
> --- a/doxygen/glsl.doxy
> +++ b/doxygen/glsl.doxy
> @@ -9,11 +9,12 @@ PROJECT_NAME   = "Mesa GLSL module"
>
>  #---
>  # configuration options related to the input files
>
>  #---
> -INPUT  = ../src/glsl/
> +INPUT  = ../src/compiler/glsl/
> +FILE_PATTERNS  = *.c *.cpp *.h
>  RECURSIVE  = NO
> -EXCLUDE= ../src/glsl/glsl_lexer.cpp \
> - ../src/glsl/glsl_parser.cpp \
> - ../src/glsl/glsl_parser.h
> +EXCLUDE= ../src/compiler/glsl/glsl_lexer.cpp \
> + ../src/compiler/glsl/glsl_parser.cpp \
> + ../src/compiler/glsl/glsl_parser.h
>  EXCLUDE_PATTERNS   =
>
>  #---
>  # configuration options related to the HTML output
> --
> 1.9.1
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>

Thanks Elie.

This patch gets my:

Reviewed-by: Rhys Kidd 
Tested-by: Rhys Kidd 

However, I believe we both do not have commit privileges to the Mesa
repository, so perhaps Emil would be able to push this commit?
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] doxygen: Generate Doxygen for NIR

2016-04-09 Thread Elie TOURNIER 
Now, one can do the following to generate and read the nir Doxygen: 
cd $MESA_TOP/doxygen
make
firefox nir/index.html

Signed-off-by: Elie TOURNIER 
---
 doxygen/.gitignore  |  1 +
 doxygen/Makefile|  3 ++-
 doxygen/header.html |  1 +
 doxygen/nir.doxy| 50 ++
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 doxygen/nir.doxy

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index a5f3921..ed94bed 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -14,6 +14,7 @@ main
 math
 math_subset
 miniglx
+nir
 radeondrm
 radeonfb
 radeon_subset
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 01c2691..cbbb40e 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -18,7 +18,8 @@ FULL = \
tnl.doxy \
tnl_dd.doxy \
gbm.doxy \
-   i965.doxy
+   i965.doxy \
+   nir.doxy
 
 full: $(FULL:.doxy=.tag)
$(foreach FILE,$(FULL),doxygen $(FILE);)
diff --git a/doxygen/header.html b/doxygen/header.html
index abd736f..8e656c1 100644
--- a/doxygen/header.html
+++ b/doxygen/header.html
@@ -8,6 +8,7 @@
 core |
 glapi |
 glsl |
+nir |
 vbo |
 math |
 shader |
diff --git a/doxygen/nir.doxy b/doxygen/nir.doxy
new file mode 100644
index 000..7e431ac
--- /dev/null
+++ b/doxygen/nir.doxy
@@ -0,0 +1,50 @@
+# Doxyfile 0.1
+
+@INCLUDE   = common.doxy
+
+#---
+# General configuration options
+#---
+PROJECT_NAME   = "Mesa NIR module"
+#---
+# Configuration options related to the input files
+#---
+INPUT  = ../src/compiler/nir
+FILE_PATTERNS  = *.c *.cpp *.h
+RECURSIVE  = NO
+EXCLUDE=
+EXCLUDE_PATTERNS   =
+EXAMPLE_PATH   =
+EXAMPLE_PATTERNS   =
+EXAMPLE_RECURSIVE  = NO
+IMAGE_PATH =
+INPUT_FILTER   =
+FILTER_SOURCE_FILES= NO
+#---
+# Configuration options related to the HTML output
+#---
+HTML_OUTPUT= nir
+#---
+# Configuration options related to the preprocessor
+#---
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION= NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES= YES
+INCLUDE_PATH   = ../include/
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED =
+EXPAND_AS_DEFINED  =
+SKIP_FUNCTION_MACROS   = YES
+#---
+# Configuration::additions related to external references
+#---
+TAGFILES   = glsl.tag=../glsl \
+ main.tag=../main \
+ math.tag=../math \
+ swrast.tag=../swrast \
+ swrast_setup.tag=../swrast_setup \
+ tnl.tag=../tnl \
+ tnl_dd.tag=../tnl_dd \
+ vbo.tag=vbo
+GENERATE_TAGFILE   = nir.tag
-- 
1.9.1

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

Re: [Mesa-dev] [PATCH] r600g: fix typo in r600 register definitions

2016-04-09 Thread eocallaghan 

Acked-by: Edward O'Callaghan 

On 2016-04-09 09:12, Marek Olšák wrote:

From: Marek Olšák 

---
 src/gallium/drivers/r600/r600d.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/r600d.h 
b/src/gallium/drivers/r600/r600d.h

index 3d223ed..ef99573 100644
--- a/src/gallium/drivers/r600/r600d.h
+++ b/src/gallium/drivers/r600/r600d.h
@@ -780,7 +780,7 @@
 #define   S_028D0C_STENCIL_COMPRESS_DISABLE(x) (((x) & 0x1) << 
5)
 #define   S_028D0C_DEPTH_COMPRESS_DISABLE(x)   (((x) & 0x1) << 
6)
 #define   S_028D0C_COPY_CENTROID(x)(((x) & 0x1) << 
7)
-#define   S_028D0C_COPY_SAMPLE(x)  (((x) & 0x1) << 
8)
+#define   S_028D0C_COPY_SAMPLE(x)  (((x) & 0x03) 
<< 8)
 #define   S_028D0C_R700_PERFECT_ZPASS_COUNTS(x)(((x) & 0x1) << 
15)
 #define   S_028D0C_CONSERVATIVE_Z_EXPORT(x)(((x) & 0x03) 
<< 13)
 #define   G_028D0C_CONSERVATIVE_Z_EXPORT(x)(((x) >> 13) & 
0x03)


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

Re: [Mesa-dev] [PATCH 1/7] gallium/radeon: move pipeline stat context flags to common code

2016-04-09 Thread eocallaghan 

This series is,

Reviewed-by: Edward O'Callaghan 

This definitely makes for a good cleanup, I was wondering about all the 
manual stuff myself..


On 2016-04-09 09:12, Marek Olšák wrote:

From: Marek Olšák 

---
 src/gallium/drivers/radeon/r600_pipe_common.h | 5 -
 src/gallium/drivers/radeonsi/si_pipe.h| 3 ---
 src/gallium/drivers/radeonsi/si_state.c   | 8 
 src/gallium/drivers/radeonsi/si_state_draw.c  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h
b/src/gallium/drivers/radeon/r600_pipe_common.h
index 7da7736..57af0ff 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -50,7 +50,10 @@
 #define R600_RESOURCE_FLAG_FORCE_TILING		(PIPE_RESOURCE_FLAG_DRV_PRIV 
<< 2)


 #define R600_CONTEXT_STREAMOUT_FLUSH   (1u << 0)
-#define R600_CONTEXT_PRIVATE_FLAG  (1u << 1)
+/* Pipeline & streamout query controls. */
+#define R600_CONTEXT_START_PIPELINE_STATS  (1u << 1)
+#define R600_CONTEXT_STOP_PIPELINE_STATS   (1u << 2)
+#define R600_CONTEXT_PRIVATE_FLAG  (1u << 3)

 /* special primitive types */
 #define R600_PRIM_RECTANGLE_LIST   PIPE_PRIM_MAX
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h
b/src/gallium/drivers/radeonsi/si_pipe.h
index 8fcfcd2..f665c81 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -66,9 +66,6 @@
 /* Compute only. */
 #define SI_CONTEXT_FLUSH_WITH_INV_L2   (R600_CONTEXT_PRIVATE_FLAG <<
13) /* TODO: merge with TC? */
 #define SI_CONTEXT_FLAG_COMPUTE(R600_CONTEXT_PRIVATE_FLAG << 
14)
-/* Pipeline & streamout query controls. */
-#define SI_CONTEXT_START_PIPELINE_STATS	(R600_CONTEXT_PRIVATE_FLAG << 
15)
-#define SI_CONTEXT_STOP_PIPELINE_STATS	(R600_CONTEXT_PRIVATE_FLAG << 
16)


 #define SI_CONTEXT_FLUSH_AND_INV_FRAMEBUFFER 
(SI_CONTEXT_FLUSH_AND_INV_CB | \

  SI_CONTEXT_FLUSH_AND_INV_CB_META 
| \
diff --git a/src/gallium/drivers/radeonsi/si_state.c
b/src/gallium/drivers/radeonsi/si_state.c
index 0c46425..94130a9 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1358,11 +1358,11 @@ static void si_set_active_query_state(struct
pipe_context *ctx, boolean enable)

/* Pipeline stat & streamout queries. */
if (enable) {
-   sctx->b.flags &= ~SI_CONTEXT_STOP_PIPELINE_STATS;
-   sctx->b.flags |= SI_CONTEXT_START_PIPELINE_STATS;
+   sctx->b.flags &= ~R600_CONTEXT_STOP_PIPELINE_STATS;
+   sctx->b.flags |= R600_CONTEXT_START_PIPELINE_STATS;
} else {
-   sctx->b.flags &= ~SI_CONTEXT_START_PIPELINE_STATS;
-   sctx->b.flags |= SI_CONTEXT_STOP_PIPELINE_STATS;
+   sctx->b.flags &= ~R600_CONTEXT_START_PIPELINE_STATS;
+   sctx->b.flags |= R600_CONTEXT_STOP_PIPELINE_STATS;
}

/* Occlusion queries. */
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c
b/src/gallium/drivers/radeonsi/si_state_draw.c
index 105c5fb..40cad50 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -722,11 +722,11 @@ void si_emit_cache_flush(struct si_context
*si_ctx, struct r600_atom *atom)
}
}

-   if (sctx->flags & SI_CONTEXT_START_PIPELINE_STATS) {
+   if (sctx->flags & R600_CONTEXT_START_PIPELINE_STATS) {
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
radeon_emit(cs, EVENT_TYPE(V_028A90_PIPELINESTAT_START) |
EVENT_INDEX(0));
-   } else if (sctx->flags & SI_CONTEXT_STOP_PIPELINE_STATS) {
+   } else if (sctx->flags & R600_CONTEXT_STOP_PIPELINE_STATS) {
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
radeon_emit(cs, EVENT_TYPE(V_028A90_PIPELINESTAT_STOP) |
EVENT_INDEX(0));


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

[Mesa-dev] [PATCH] nir: Merge redudant integer clamping.

2016-04-09 Thread Markus Wick 
Dolphin uses them a lot. Range tracking would be better in the long term,
but this two lines works fine for now.

Signed-off-by: Markus Wick 
---
 src/compiler/nir/nir_opt_algebraic.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_opt_algebraic.py 
b/src/compiler/nir/nir_opt_algebraic.py
index e72b4a7..31d7655 100644
--- a/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@ -137,7 +137,10 @@ optimizations = [
(('~fmax', ('fmin', a, 1.0), 0.0), ('fsat', a), '!options->lower_fsat'),
(('fsat', a), ('fmin', ('fmax', a, 0.0), 1.0), 'options->lower_fsat'),
(('fsat', ('fsat', a)), ('fsat', a)),
-   (('fmin', ('fmax', ('fmin', ('fmax', a, 0.0), 1.0), 0.0), 1.0), ('fmin', 
('fmax', a, 0.0), 1.0)),
+   (('fmin', ('fmax', ('fmin', ('fmax', a, b), c), b), c), ('fmin', ('fmax', 
a, b), c)),
+   (('imin', ('imax', ('imin', ('imax', a, b), c), b), c), ('imin', ('imax', 
a, b), c)),
+   (('umin', ('umax', ('umin', ('umax', a, b), c), b), c), ('umin', ('umax', 
a, b), c)),
+   (('extract_u8', ('imin', ('imax', a, 0), 0xff), 0), ('imin', ('imax', a, 
0), 0xff)),
(('~ior', ('flt', a, b), ('flt', a, c)), ('flt', a, ('fmax', b, c))),
(('~ior', ('flt', a, c), ('flt', b, c)), ('flt', ('fmin', a, b), c)),
(('~ior', ('fge', a, b), ('fge', a, c)), ('fge', a, ('fmin', b, c))),
-- 
2.8.0

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

[Mesa-dev] [Bug 94876] Error when starting minecraft with Optifine and a Ressourcepack

2016-04-09 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=94876

Rocologo  changed:

   What|Removed |Added

Summary|Error when sytarting|Error when starting
   ||minecraft with Optifine and
   ||a Ressourcepack

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are the assignee for the bug.___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 94876] Error when sytarting

2016-04-09 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=94876

Bug ID: 94876
   Summary: Error when sytarting
   Product: Mesa
   Version: unspecified
  Hardware: Other
OS: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: Mesa core
  Assignee: mesa-dev@lists.freedesktop.org
  Reporter: rocol...@rocologo.tk
QA Contact: mesa-dev@lists.freedesktop.org

This is the error code i got while trying to test a new texturepack in
Minecraft. 

[09:35:12] [Client thread/INFO]: [CHAT] You currently have a total OnTime of  
5  Day   8  Hr   8  Min   
[09:35:12] [Client thread/INFO]: [CHAT] * *Gabriel333 is now AFK.
[Shaders] Reset model renderers
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at clear pre
FramebufferStatus 0x8CDD at clear
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at clear
GL error 0x0506: Invalid framebuffer operation at gbuffers_skybasic fogMode
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
preCelestialRotate
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
FramebufferStatus 0x8CDD at beginHand
Mesa 10.5.9 implementation error: gen8_update_renderbuffer_surface:
renderbuffer format MESA_FORMAT_RGBX_UNORM16 unsupported

Please report at https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa
FramebufferStatus 0x8CDD at pre endHand
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at copy depth
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at composite
[09:35:13] [Client thread/INFO]: Stopping!
[09:35:13] [Client thread/INFO]: SoundSystem shutting down...
[09:35:13] [Client thread/WARN]: Author: Paul Lamb, www.paulscode.com


And after restarting Minecraft I got this error.

GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at composite
[09:56:56] [Client thread/ERROR]: ## GL ERROR ##
[09:56:56] [Client thread/ERROR]: @ Pre render
[09:56:56] [Client thread/ERROR]: 1282: Invalid operation
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at clear pre
FramebufferStatus 0x8CDD at clear
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at clear
GL error 0x0506: Invalid framebuffer operation at gbuffers_skybasic fogMode
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
preCelestialRotate
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
FramebufferStatus 0x8CDD at beginHand
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at pre
endHand
FramebufferStatus 0x8CDD at pre endHand
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at copy depth
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at composite
[09:56:56] [Client thread/ERROR]: ## GL ERROR ##
[09:56:56] [Client thread/ERROR]: @ Pre render
[09:56:56] [Client thread/ERROR]: 1282: Invalid operation
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at clear pre
FramebufferStatus 0x8CDD at clear
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at clear
GL error 0x0506: Invalid framebuffer operation at gbuffers_skybasic fogMode
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
preCelestialRotate
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
FramebufferStatus 0x8CDD at beginHand
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at pre
endHand
FramebufferStatus 0x8CDD at pre endHand
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at copy depth
GL error 0x0506: Invalid framebuffer operation (Fb status 0x8CDD) at
pre-useProgram
GL error 0x0506: Invalid f

Re: [Mesa-dev] [PATCH v7 0/7] add clLinkProgram

2016-04-09 Thread Serge Martin 
On Monday 29 February 2016 12:36:36 Francisco Jerez wrote:
> Serge Martin  writes:
> > Ping
> 
> Thanks for trying to split some of the LLVM interfacing changes into
> separate patches.  I'm about 80% done cleaning up the mess that
> llvm/invocation.cpp is, I'll take care of rebasing your series and pong
> you once I'm done.  Unfortunately the core/api changes from this series
> are too tightly coupled to the llvm stuff to land any of it in the
> meantime (except maybe PATCH 5).

Hello

Any news regarding this?

Serge

> 
> > On Saturday 13 February 2016 23:08:34 Serge Martin wrote:
> >> This serie add clLinkProgram function needed for CL 1.2.
> >> However, it lacks the binary type part that is mandatory for input
> >> validation and also for CL_PROGRAM_BINARY_TYPE query. This will be
> >> adressed
> >> in another serie once we agree on the way to store it.
> >> 
> >> Serge Martin (7):
> >>   clover: add a LLVM compiler class
> >>   clover: make use of llvm_ir_compiler
> >>   clover: program::build change opts to std::string
> >>   clover: separate compilation and link stages
> >>   clover: override ret_object
> >>   clover: add clLinkProgram (CL 1.2)
> >>   clover: add -create-library option support
> >>  
> >>  src/gallium/state_trackers/clover/Makefile.sources |   3 +-
> >>  src/gallium/state_trackers/clover/api/program.cpp  |  50 ++-
> >>  src/gallium/state_trackers/clover/api/util.hpp |  12 +
> >>  .../state_trackers/clover/core/compiler.hpp|   7 +-
> >>  src/gallium/state_trackers/clover/core/error.hpp   |   7 +
> >>  src/gallium/state_trackers/clover/core/program.cpp |  40 ++-
> >>  src/gallium/state_trackers/clover/core/program.hpp |  10 +-
> >>  .../state_trackers/clover/llvm/invocation.cpp  | 345
> >> 
> >> +++-- .../state_trackers/clover/llvm/ir_compiler.cpp
> >> |
> >> 337  .../state_trackers/clover/llvm/ir_compiler.hpp
> >> 
> >> |  65 
> >>  
> >>  10 files changed, 619 insertions(+), 257 deletions(-)
> >>  create mode 100644
> >>  src/gallium/state_trackers/clover/llvm/ir_compiler.cpp
> >>  create mode 100644
> >>  src/gallium/state_trackers/clover/llvm/ir_compiler.hpp
> > 
> > ___
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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