Re: [Mesa-dev] [PATCH v2 0/6] Minor fixes to the code that populates the dispatch table.

2012-10-22 Thread Jordan Justen
Reviewed-by: Jordan Justen On Mon, Oct 22, 2012 at 5:22 PM, Paul Berry wrote: > Changes based on comments from Matt and Brian. Patch 3/6 has been > added. Patch 6/6 has been updated. > > [PATCH v2 1/6] main: Fix warning ('struct gl_context' declared inside > parameter list). > [PATCH v2 2/6]

[Mesa-dev] [PATCH v2 6/6] _mesa_create_exec_table: GLES3 fixes.

2012-10-22 Thread Paul Berry
This patch sets up the dispatch table for the following GLES3 functions when a GLES3 context is in use: - BeginQuery - BeginTransformFeedback - BindSampler - BindTransformFeedback - BlitFramebuffer - ClearBufferfi - ClearBufferfv - ClearBufferiv - ClearBufferuiv - ClientWaitSync - CopyBufferSubDat

[Mesa-dev] [PATCH v2 5/6] _mesa_create_exec_table(): deprecate ProgramStringARB.

2012-10-22 Thread Paul Berry
This function is only useful for the ARB_{vertex,fragment}_program extensions, which we don't expose in core contexts. Reviewed-by: Brian Paul --- src/mesa/main/api_exec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c i

[Mesa-dev] [PATCH v2 4/6] _mesa_create_exec_table: de-deprecate GetPointerv.

2012-10-22 Thread Paul Berry
glGetPointerv was de-deprecated in GL 4.3, because GL 4.3 adds functionality from KHR_debug and ARB_debug_output, which require glGetPointerv. This patch modifies _mesa_create_exec_table() to populate glGetPointerv in the dispatch table for core contexts. Technically this is not in compliance wit

[Mesa-dev] [PATCH v2 3/6] glapi: Alias VertexAttribDivisor and VertexAttribDivisorARB.

2012-10-22 Thread Paul Berry
There's no reason to have separate slots in the dispatch table for these two functions, since they are synonymous. Note: previous to this patch, we never populated the dispatch table slot for VertexAttribDivisor, which was ok, since it is not required until 3.3. After this patch, both functions w

[Mesa-dev] [PATCH v2 2/6] glapi: Alias ClampColor and ClampColorARB.

2012-10-22 Thread Paul Berry
There's no reason to have separate slots in the dispatch table for these two functions, since they are synonymous. Reviewed-by: Brian Paul --- src/mapi/glapi/gen/GL3x.xml | 2 +- src/mesa/main/api_exec.c| 1 - src/mesa/main/dlist.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-)

[Mesa-dev] [PATCH v2 1/6] main: Fix warning ('struct gl_context' declared inside parameter list).

2012-10-22 Thread Paul Berry
This eliminates a warning in GCC 4.7.1. Reviewed-by: Brian Paul --- src/mesa/main/api_loopback.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h index 3e43286..628d4f8 100644 --- a/src/mesa/main/api_loopback.h +++ b/src/mesa/main/ap

[Mesa-dev] [PATCH v2 0/6] Minor fixes to the code that populates the dispatch table.

2012-10-22 Thread Paul Berry
Changes based on comments from Matt and Brian. Patch 3/6 has been added. Patch 6/6 has been updated. [PATCH v2 1/6] main: Fix warning ('struct gl_context' declared inside parameter list). [PATCH v2 2/6] glapi: Alias ClampColor and ClampColorARB. [PATCH v2 3/6] glapi: Alias VertexAttribDivisor a

Re: [Mesa-dev] [PATCH] mesa: Use MIN instead of CLAMP for unsigned source data

2012-10-22 Thread Brian Paul
On 10/22/2012 03:26 PM, Ian Romanick wrote: From: Ian Romanick This silences a zillion GCC warnings like: ../../../src/mesa/main/pack.c: In function '_mesa_pack_rgba_span_from_uints': ../../../src/mesa/main/pack.c:560:13: warning: comparison of unsigned expression< 0 is always false [-Wtype-l

Re: [Mesa-dev] [PATCH 5/5] _mesa_create_exec_table: GLES3 fixes.

2012-10-22 Thread Paul Berry
On 22 October 2012 11:49, Brian Paul wrote: > On 10/22/2012 10:35 AM, Paul Berry wrote: > >> diff --git a/src/mesa/main/transformfeedback.c >> b/src/mesa/main/transformfeedback.c >> index ea6cfdf..8a5359f 100644 >> --- a/src/mesa/main/**transformfeedback.c >> +++ b/src/mesa/main/**transformfeedba

Re: [Mesa-dev] [PATCH 5/5] _mesa_create_exec_table: GLES3 fixes.

2012-10-22 Thread Paul Berry
On 22 October 2012 11:36, Matt Turner wrote: > On Mon, Oct 22, 2012 at 9:35 AM, Paul Berry > wrote: > > This patch sets up the dispatch table for the following GLES3 > > functions when a GLES3 context is in use: > > > > - BeginQuery > > - BeginTransformFeedback > > - BindSampler > > - BindTransf

[Mesa-dev] [PATCH] glsl: Make access to type flyweight global state thread safe

2012-10-22 Thread Ian Romanick
From: Ian Romanick This should fix some problems related to compiling shaders in different contextes from multiple threads. Signed-off-by: Ian Romanick Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54773 Cc: w_tresspass...@yahoo.co.jp --- src/glsl/builtin_types.h | 16

[Mesa-dev] [PATCH] mesa: Use MIN instead of CLAMP for unsigned source data

2012-10-22 Thread Ian Romanick
From: Ian Romanick This silences a zillion GCC warnings like: ../../../src/mesa/main/pack.c: In function '_mesa_pack_rgba_span_from_uints': ../../../src/mesa/main/pack.c:560:13: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] Signed-off-by: Ian Romanick --- src

Re: [Mesa-dev] [PATCH 5/8] mesa: fix indentation in get-pick-list.sh script

2012-10-22 Thread Ian Romanick
On 10/22/2012 01:00 PM, Andreas Boll wrote: NOTE: This is a candidate for the stable branches. The first five patches look great. You improved my script a lot. I'd suggest squashing them together before pushing. That makes it a lot easier to pick over. Reviewed-by: Ian Romanick ---

Re: [Mesa-dev] [PATCH 7/8] mesa: update .cherry-ignore file

2012-10-22 Thread Ian Romanick
On 10/22/2012 01:00 PM, Andreas Boll wrote: --- This patch is only for the 8.0 branch. bin/.cherry-ignore | 22 ++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index cab2d46..9e2dc7d 100644 --- a/bin/.cherry-ign

[Mesa-dev] [PATCH 8/8] mesa: use .cherry-ignore in the get-pick-list.sh script

2012-10-22 Thread Andreas Boll
NOTE: This is a candidate for the stable branches. --- bin/get-pick-list.sh |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 7288090..a141afe 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -12,8 +12,8 @@

[Mesa-dev] [PATCH 7/8] mesa: update .cherry-ignore file

2012-10-22 Thread Andreas Boll
--- This patch is only for the 8.0 branch. bin/.cherry-ignore | 22 ++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index cab2d46..9e2dc7d 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -4,6 +4,9 @@ efd

[Mesa-dev] [PATCH 6/8] mesa: add .cherry-ignore file

2012-10-22 Thread Andreas Boll
From: Ian Romanick --- This patch is only for the 8.0 branch. bin/.cherry-ignore | 68 1 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 bin/.cherry-ignore diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore new file

[Mesa-dev] [PATCH 5/8] mesa: fix indentation in get-pick-list.sh script

2012-10-22 Thread Andreas Boll
NOTE: This is a candidate for the stable branches. --- bin/get-pick-list.sh |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 363bac7..7288090 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -11,11 +11,

[Mesa-dev] [PATCH 4/8] mesa: grep for commits with cherry picked in commit message only once

2012-10-22 Thread Andreas Boll
and save them temporary in already_picked NOTE: This is a candidate for the stable branches. --- bin/get-pick-list.sh | 11 +-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 3920a9b..363bac7 100755 --- a/bin/get-pick-lis

[Mesa-dev] [PATCH 3/8] mesa: optimize get-pick-list.sh

2012-10-22 Thread Andreas Boll
cuts down the while loop iterations from 4600 to 380 commits at the moment NOTE: This is a candidate for the stable branches. --- bin/get-pick-list.sh |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index ad97d06..3920a9b

[Mesa-dev] [PATCH 2/8] mesa: simplify get-pick-list.sh script

2012-10-22 Thread Andreas Boll
and add a description for the script NOTE: This is a candidate for the stable branches. --- bin/get-pick-list.sh |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index aae8fd5..ad97d06 100755 --- a/bin/get-pick-list.sh +++ b/b

[Mesa-dev] [PATCH 1/8] mesa: add get-pick-list.sh script into bin/

2012-10-22 Thread Andreas Boll
From: Ian Romanick NOTE: This is a candidate for the stable branches. --- bin/get-pick-list.sh | 21 + 1 files changed, 21 insertions(+), 0 deletions(-) create mode 100755 bin/get-pick-list.sh diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh new file mode 100755 i

[Mesa-dev] [PATCH 0/8] Add a script for generating a list of candidates for cherry-picking

2012-10-22 Thread Andreas Boll
Hi Ian, I've merged our scripts for generating the cherry-pick list. This should improve the maintenance effort of the stable branches. A separate .cherry-ignore file for the 9.0 branch is needed. Andreas. Andreas Boll (6): mesa: simplify get-pick-list.sh script mesa: optimize get-pick-list

Re: [Mesa-dev] [PATCH 5/5] _mesa_create_exec_table: GLES3 fixes.

2012-10-22 Thread Brian Paul
On 10/22/2012 10:35 AM, Paul Berry wrote: This patch sets up the dispatch table for the following GLES3 functions when a GLES3 context is in use: - BeginQuery - BeginTransformFeedback - BindSampler - BindTransformFeedback - BlitFramebuffer - ClearBufferfi - ClearBufferfv - ClearBufferiv - ClearB

Re: [Mesa-dev] [PATCH 5/5] _mesa_create_exec_table: GLES3 fixes.

2012-10-22 Thread Matt Turner
On Mon, Oct 22, 2012 at 9:35 AM, Paul Berry wrote: > This patch sets up the dispatch table for the following GLES3 > functions when a GLES3 context is in use: > > - BeginQuery > - BeginTransformFeedback > - BindSampler > - BindTransformFeedback > - BlitFramebuffer > - ClearBufferfi > - ClearBuffer

[Mesa-dev] [PATCH] glcpp: Don't use infinite lookhead for #define differentiation.

2012-10-22 Thread Kenneth Graunke
Previously, we used lookahead patterns to differentiate: #define FOO(x) function macro #define FOO (x) object macro Unfortunately, our rule for function macros: {HASH}define{HSPACE}+/{IDENTIFIER}"(" relies on infinite lookahead, and apparently triggers a Flex bug where the generated c

Re: [Mesa-dev] [PATCH 3/6] i965: Generalize GL_FIXED VS w/a support

2012-10-22 Thread Eric Anholt
Chris Forbes writes: > Next few patches build on this to add other workarounds > for packed formats. > diff --git a/src/mesa/drivers/dri/i965/brw_vs.h > b/src/mesa/drivers/dri/i965/brw_vs.h > index adeff7f..9da4cb0 100644 > --- a/src/mesa/drivers/dri/i965/brw_vs.h > +++ b/src/mesa/drivers/dri/i

Re: [Mesa-dev] [PATCH 1/2] intel: Enable S3TC extensions always

2012-10-22 Thread Eric Anholt
Ian Romanick writes: > From: Ian Romanick > > Always enable the use of pre- compressed texture data, and always advertise > the ability to do on-line compression. The ability to perform on-line > compression still requires the presence of libtxc_dxtn, so sometimes the > driver incorrectly over-

Re: [Mesa-dev] [PATCH 00/27] intel: Add ETC2 compressed textures support

2012-10-22 Thread Anuj Phogat
On Fri, Oct 19, 2012 at 11:32 PM, Philipp Klaus Krause wrote: > On 20.10.2012 01:28, Anuj Phogat wrote: >> This series lives on my etc2-v9 branch (https://github.com/aphogat/mesa). >> >> This series enables 8 out of 10 ETC2 texture formats for all Intel >> hardware by simply decoding the ETC2 data

[Mesa-dev] [PATCH 5/5] _mesa_create_exec_table: GLES3 fixes.

2012-10-22 Thread Paul Berry
This patch sets up the dispatch table for the following GLES3 functions when a GLES3 context is in use: - BeginQuery - BeginTransformFeedback - BindSampler - BindTransformFeedback - BlitFramebuffer - ClearBufferfi - ClearBufferfv - ClearBufferiv - ClearBufferuiv - ClientWaitSync - CopyBufferSubDat

[Mesa-dev] [PATCH 4/5] _mesa_create_exec_table(): deprecate ProgramStringARB.

2012-10-22 Thread Paul Berry
This function is only useful for the ARB_{vertex,fragment}_program extensions, which we don't expose in core contexts. --- src/mesa/main/api_exec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 9958496..7a000e7 1006

[Mesa-dev] [PATCH 3/5] _mesa_create_exec_table: de-deprecate GetPointerv.

2012-10-22 Thread Paul Berry
glGetPointerv was de-deprecated in GL 4.3, because GL 4.3 adds functionality from KHR_debug and ARB_debug_output, which require glGetPointerv. This patch modifies _mesa_create_exec_table() to populate glGetPointerv in the dispatch table for core contexts. Technically this is not in compliance wit

[Mesa-dev] [PATCH 2/5] glapi: Alias ClampColor and ClampColorARB.

2012-10-22 Thread Paul Berry
There's no reason to have separate slots in the dispatch table for these two functions, since they are synonymous. --- src/mapi/glapi/gen/GL3x.xml | 2 +- src/mesa/main/api_exec.c| 1 - src/mesa/main/dlist.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mapi/gl

[Mesa-dev] [PATCH 1/5] main: Fix warning ('struct gl_context' declared inside parameter list).

2012-10-22 Thread Paul Berry
This eliminates a warning in GCC 4.7.1. --- src/mesa/main/api_loopback.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h index 3e43286..628d4f8 100644 --- a/src/mesa/main/api_loopback.h +++ b/src/mesa/main/api_loopback.h @@ -31,6 +31,

[Mesa-dev] [PATCH 0/5] Minor fixes to the code that populates the dispatch table.

2012-10-22 Thread Paul Berry
This patch series makes several minor corrections to the code that populates the desktop/GLES2 dispatch table (_mesa_create_exec_table() and related code): Patch 1/5 avoids an annoying compiler warning. Patch 2/5 makes ClampColor and ClampColorARB share aliases of each other. (Previously these f

Re: [Mesa-dev] [PATCH 1/6] i965: implement get_size for 2_10_10_10 formats

2012-10-22 Thread Eric Anholt
Chris Forbes writes: > Signed-off-by: Chris Forbes > --- > src/mesa/drivers/dri/i965/brw_draw_upload.c | 4 > 1 file changed, 4 insertions(+) > > diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c > b/src/mesa/drivers/dri/i965/brw_draw_upload.c > index f5f65ca..8ffcc57 100644 > ---

Re: [Mesa-dev] [PATCH] i965/vs: Fix debug dumping of VS push constants.

2012-10-22 Thread Eric Anholt
Kenneth Graunke writes: > While copying the values into the batch space, we advance the param > pointer. The debug code then tries to iterate over all the uploaded > values, starting at param...which is now the end of the uploaded data, > rather than the start. > > This patch saves a pointer to

Re: [Mesa-dev] [PATCH 1/6] radeon/llvm: interp instructions emits native outputs

2012-10-22 Thread Tom Stellard
On Mon, Oct 22, 2012 at 12:03:35AM +0200, Vincent Lejeune wrote: > --- > lib/Target/AMDGPU/R600ExpandSpecialInstrs.cpp | 30 > +++ > lib/Target/AMDGPU/R600Instructions.td | 25 +- > lib/Target/AMDGPU/R600RegisterInfo.td | 10 + >

Re: [Mesa-dev] [PATCH] i965: Fix regression in depth texture rendering on pre-SNB

2012-10-22 Thread Ian Romanick
On 10/20/2012 10:02 PM, Kenneth Graunke wrote: On 10/19/2012 02:11 PM, Ian Romanick wrote: From: Ian Romanick This was introduced by commit 24db6d6 (cherry-picked from a683012). The original patch fixed potential GPU hangs on SNB, and it caused some rendering regressions there. The benefits

Re: [Mesa-dev] [PATCH] scons: Do not use -fvisibilty=hidden on Cygwin.

2012-10-22 Thread Brian Paul
On 10/19/2012 11:23 PM, Vinson Lee wrote: This is a follow-up to commit db78643182dc39ed592dd8c2e5fc7c8eeb7316a1. Signed-off-by: Vinson Lee --- scons/gallium.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scons/gallium.py b/scons/gallium.py index c3f33a0..bba3f01

Re: [Mesa-dev] [PATCH 3/3] r600g: tgsi-to-llvm emits right input intrinsics

2012-10-22 Thread Tom Stellard
On Fri, Oct 19, 2012 at 11:19:34PM +0200, Vincent Lejeune wrote: > --- > src/gallium/drivers/r600/r600_llvm.c | 62 > +++--- > src/gallium/drivers/r600/r600_shader.c | 22 +++- > 2 files changed, 62 insertions(+), 22 deletions(-) > > diff --git a/src/gallium

Re: [Mesa-dev] [PATCH 2/3] r600g: force bank_swizzle if already set

2012-10-22 Thread Tom Stellard
On Fri, Oct 19, 2012 at 11:19:33PM +0200, Vincent Lejeune wrote: > --- > src/gallium/drivers/r600/r700_asm.c | 2 ++ > 1 file changed, 2 insertions(+) > We should also make this change to r600_bytecode_alu_read() in r600_asm.c With that fix: Reviewed-by: Tom Stellard > diff --git a/src/galliu

Re: [Mesa-dev] [PATCH 1/3] r600g: rewrite tgsi-to-llvm load-input to handle fragcoord

2012-10-22 Thread Tom Stellard
On Fri, Oct 19, 2012 at 11:19:32PM +0200, Vincent Lejeune wrote: > --- > src/gallium/drivers/r600/r600_llvm.c | 124 > ++--- > src/gallium/drivers/r600/r600_shader.c | 2 +- > 2 files changed, 84 insertions(+), 42 deletions(-) > Reviewed-by: Tom Stellard > diff

Re: [Mesa-dev] [PATCH 1/1] intel: corrected the header include path for recent Valgrind versions.

2012-10-22 Thread Chris Wilson
On Mon, 22 Oct 2012 15:00:20 +0300, Oliver McFadden wrote: > intel_bufmgr_gem.c:67:22: fatal error: valgrind.h: No such file or directory Should be setup by `pkg-config --clfags valgrind` to point into the right valgrind header directory. -Chris -- Chris Wilson, Intel Open Source Technology Ce

[Mesa-dev] [PATCH 1/1] intel: corrected the header include path for recent Valgrind versions.

2012-10-22 Thread Oliver McFadden
intel_bufmgr_gem.c:67:22: fatal error: valgrind.h: No such file or directory Signed-off-by: Oliver McFadden --- intel/intel_bufmgr_gem.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 8d45839..f5a468c 100644 -