[Mesa-dev] [PATCH 3/7] mesa: remove _NORMAPI, _NORMAPIP macros

2015-02-27 Thread Brian Paul
Was only used in one place. Use equivalent _XFORMAPIP there instead. --- src/mesa/main/compiler.h | 7 --- src/mesa/math/m_xform.h | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index cb1ea46..9d7df05 100644 --- a/src

[Mesa-dev] [PATCH 7/7] mesa: trim down #includes in api_loopback.h

2015-02-27 Thread Brian Paul
--- src/mesa/main/api_loopback.h | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h index eb3d54b..4451440 100644 --- a/src/mesa/main/api_loopback.h +++ b/src/mesa/main/api_loopback.h @@ -27,12 +27,7 @@ #ifndef API

Re: [Mesa-dev] [PATCH 1/5] meta: silence uninitialized variable warnings for MinGW

2015-02-27 Thread Brian Paul
On 02/27/2015 06:00 PM, Matt Turner wrote: On Fri, Feb 27, 2015 at 12:07 PM, Brian Paul wrote: --- src/mesa/drivers/common/meta_blit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index 971a2ff..bb21642

[Mesa-dev] merging compiler.h, util/macros.h and p_compiler.h

2015-02-27 Thread Brian Paul
These three files all define macros in the same vein and are useful everywhere. I'd like to replace them with a common util/compiler.h file. There's already some overlap in these files. Take a look at them and let me know if there's any concerns. I think a few things could be factored out

Re: [Mesa-dev] [PATCH 2/7] mesa: move FLT_MAX_EXP to c99_math.h

2015-02-28 Thread Brian Paul
On 02/28/2015 03:48 AM, Emil Velikov wrote: On 28/02/15 00:47, Brian Paul wrote: --- include/c99_math.h | 4 src/mesa/main/compiler.h | 4 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/c99_math.h b/include/c99_math.h index 35173c6..0a49950 100644

Re: [Mesa-dev] [PATCH 4/7] mesa: move finite macro to imports.h

2015-02-28 Thread Brian Paul
On 02/28/2015 03:50 AM, Emil Velikov wrote: On 28/02/15 00:47, Brian Paul wrote: Move it to the only place it's used. --- src/mesa/main/compiler.h | 8 src/mesa/main/imports.h | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mesa/main/compile

[Mesa-dev] [PATCH] i965: add GLSL_TYPE_DOUBLE switch case to silence warning

2015-02-28 Thread Brian Paul
--- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 0eab053..57c4d66 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/

[Mesa-dev] [PATCH] mesa: remove unnecessary uninitialized_var() macro

2015-02-28 Thread Brian Paul
Only used in one place. Just use conventional initializers there. --- src/mesa/main/compiler.h | 8 src/mesa/x86/common_x86.c | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 796870d..a0ef75a 100644 --- a/s

Re: [Mesa-dev] [PATCH 1/7] mesa: move ONE_DIV_SQRT_LN2 to prog_statevars.c

2015-02-28 Thread Brian Paul
On 02/27/2015 08:53 PM, Ian Romanick wrote: Patches 1 through 5 seem innocuous enough and are Reviewed-by: Ian Romanick Do you have a tree somewhere that I could pull to make sure the others don't break my build? :) I don't, actually. But I've tested the i965 / DRI build here. OK? -Brian

[Mesa-dev] [PATCH 12/14] r200: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/drivers/dri/r200/r200_sanity.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_sanity.c b/src/mesa/drivers/dri/r200/r200_sanity.c index 8f7c0fe..ab922e5 100644 --- a/src/mesa/drivers/dri/r200/r200_sanity.c +++

[Mesa-dev] [PATCH 06/14] st/dri: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/gallium/state_trackers/dri/dri_screen.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index 9cdebf8..1b14ab1 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++

[Mesa-dev] [PATCH 11/14] nouveau: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/drivers/dri/nouveau/nouveau_screen.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c index 150dd8e..b9ae959 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_scre

[Mesa-dev] [PATCH 04/14] mesa/program: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/program/ir_to_mesa.cpp | 2 +- src/mesa/program/prog_execute.c | 2 +- src/mesa/program/prog_print.c | 16 src/mesa/program/prog_statevars.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mes

[Mesa-dev] [PATCH 08/14] mapi: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mapi/glapi/gen/gl_enums.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py index 35919d6..d61618f 100644 --- a/src/mapi/glapi/gen/gl_enums.py +++ b/src/mapi/glapi/gen/gl_enums.py @@ -83,7 +83,7 @@ const

[Mesa-dev] [PATCH 02/14] mesa/vbo: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/vbo/vbo_context.c| 4 ++-- src/mesa/vbo/vbo_exec_api.c | 12 ++-- src/mesa/vbo/vbo_exec_array.c | 4 ++-- src/mesa/vbo/vbo_exec_draw.c | 8 src/mesa/vbo/vbo_exec_eval.c | 8 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/mesa

[Mesa-dev] [PATCH 13/14] radeon: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/drivers/dri/radeon/radeon_sanity.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_sanity.c b/src/mesa/drivers/dri/radeon/radeon_sanity.c index bb2a3bf..ca10fc3 100644 --- a/src/mesa/drivers/dri/radeon/rade

[Mesa-dev] [PATCH 03/14] mesa/swrast: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/swrast/s_points.c | 2 +- src/mesa/swrast/s_texfetch.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c index 52a7222..8180483 100644 --- a/src/mesa/swrast/s_points.c +++ b/src/mesa/swrast/s_points.c @@ -1

[Mesa-dev] [PATCH 05/14] st/mesa: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/state_tracker/st_atom.c | 4 ++-- src/mesa/state_tracker/st_cb_drawpixels.c | 4 ++-- src/mesa/state_tracker/st_cb_rasterpos.c | 2 +- src/mesa/state_tracker/st_cb_xformfb.c | 8 src/mesa/state_tracker/st_context.c| 6 +++--- src/mesa/state_track

[Mesa-dev] [PATCH 10/14] i965: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/drivers/dri/i965/brw_eu_emit.c| 8 src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 2 +- src/mesa/drivers/dri/i965/gen6_sol.c | 2 +- src/mesa/drivers/dri/i965/intel_fbo.c | 2 +- 5 files chang

[Mesa-dev] [PATCH 01/14] mesa/main: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
We've been using a mix of these two macros for a while now. Let's just use the later everywhere. It seems to be the convention used by other open-source projects. --- src/mesa/main/arrayobj.c | 6 +++--- src/mesa/main/attrib.c| 2 +- src/mesa/main/blend.c | 2

[Mesa-dev] [PATCH 09/14] i915: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/mesa/drivers/dri/i915/intel_fbo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c index 2a34385..1e1397d 100644 --- a/src/mesa/drivers/dri/i915/intel_fbo.c +++ b/src/mesa/drivers/dri/i915/int

[Mesa-dev] [PATCH 07/14] glsl: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/glsl/builtin_functions.cpp| 2 +- src/glsl/builtin_variables.cpp| 2 +- src/glsl/glsl_parser.yy | 4 ++-- src/glsl/glsl_parser_extras.cpp | 8 src/glsl/ir.cpp

[Mesa-dev] [PATCH 14/14] mesa: remove the Elements() macro definition

2015-02-28 Thread Brian Paul
No longer used. --- src/mesa/main/compiler.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index a0ef75a..7f2d732 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -175,9 +175,6 @@ static inline GLuint CPU_TO_LE32(GL

Re: [Mesa-dev] [Mesa-stable] [PATCH] mesa: Indent break statements and add a missing one.

2015-02-28 Thread Brian Paul
Reviewed-by: Brian Paul On 02/28/2015 12:02 PM, Matt Turner wrote: Always indenting break statements makes spotting missing ones easier. Cc: 10.5 --- src/mesa/main/pack.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/pack.c b/src/mesa/main

Re: [Mesa-dev] [PATCH] mesa: Check return value of __get_cpuid().

2015-02-28 Thread Brian Paul
Reviewed-by: Brian Paul On 02/28/2015 11:09 AM, Matt Turner wrote: The use of the uninitialized_var() macro was to silence an uninitialized variable warning that I assumed stemmed from gcc being unable to see inside __get_cpuid() or understand its inline assembly. In fact, it was because the

Re: [Mesa-dev] [PATCH 0/6] egl: Drop non-c99 keywords - INLINE, __FUNCTION__

2015-02-28 Thread Brian Paul
hVMNtXt-uEs&r=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8&m=5AwTKH7m3N3qjutRrxaUH_i60V8B_v8k8BlE5JyDIoQ&s=YKg7sFdmdC7VRFbFtTsz46moZjDVrPLIm0wrb8dWtns&e= I didn't test it, but all the changes look good to me. Reviewed-by: Brian Paul

Re: [Mesa-dev] [PATCH] mesa: remove unnecessary uninitialized_var() macro

2015-02-28 Thread Brian Paul
On 02/28/2015 11:11 AM, Matt Turner wrote: On Sat, Feb 28, 2015 at 7:43 AM, Brian Paul wrote: Only used in one place. Just use conventional initializers there. --- src/mesa/main/compiler.h | 8 src/mesa/x86/common_x86.c | 3 +-- 2 files changed, 1 insertion(+), 10 deletions

Re: [Mesa-dev] [PATCH 01/14] mesa/main: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
On 02/28/2015 10:32 AM, Ilia Mirkin wrote: I pulled down the patches from patchwork and verified using tools that the only changes (except for the last patch) are Elements -> ARRAY_SIZE. This is the command I used: diff -u <( git diff e8cf8d013fcd7a15e94103b9367d89394de7a067^.. | grep -P '^\+[^+

[Mesa-dev] [PATCH] mesa: remove extra definition of ARRAY_SIZE in src/mesa/main/macros.h

2015-02-28 Thread Brian Paul
Already defined in src/util/macros.h --- src/mesa/main/macros.h | 4 1 file changed, 4 deletions(-) diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index da5e8e8..2d7a6a1 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -803,10 +803,6 @@ DIFFERENT_SIGNS(GLfloa

[Mesa-dev] [PATCH] util: replace Elements() with ARRAY_SIZE()

2015-02-28 Thread Brian Paul
--- src/util/bitset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/bitset.h b/src/util/bitset.h index 17c5d5d..febcdde 100644 --- a/src/util/bitset.h +++ b/src/util/bitset.h @@ -94,6 +94,6 @@ __bitset_ffs(const BITSET_WORD *x, int n) return 0; } -#define BITS

Re: [Mesa-dev] [PATCH] c99_alloca.h: Include stdlib.h on all non-Windows.

2015-03-02 Thread Brian Paul
malloc.h which includes alloca.h On Linux, stdlib.h includes alloca.h directly. Tested-by: Brian Paul I'll commit this. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] c99_alloca.h: Include stdlib.h on all non-Windows.

2015-03-02 Thread Brian Paul
On 03/01/2015 02:00 PM, Alan Coopersmith wrote: On 03/ 1/15 12:52 PM, Vinson Lee wrote: Fix build on FreeBSD. Bugzilla: https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs.freedesktop.org_show-5Fbug.cgi-3Fid-3D89364&d=AwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=T0t4QG7chq2ZwJo6

Re: [Mesa-dev] [PATCH excerpt] mesa: Wrap unlikely() around conditions leading to _mesa_error().

2015-03-02 Thread Brian Paul
=292). Signed-off-by: Kenneth Graunke I like it. But I have to say, when I first proposed doing this last year (IIRC) someone poo-pood it. I don't remember who. Acked-by: Brian Paul ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org

Re: [Mesa-dev] [PATCH excerpt] mesa: Wrap unlikely() around conditions leading to _mesa_error().

2015-03-02 Thread Brian Paul
On 03/02/2015 04:03 PM, Eric Anholt wrote: Kenneth Graunke writes: Generated by the following Coccinelle semantic patch: @@ expression E; @@ if ( -E +unlikely(E) ) { ... _mesa_error(...) ... } Improves performance in OglBatch7 (a CPU-bound microbenchmark) on an i7 4750HQ (Haswell) by 1.085

Re: [Mesa-dev] [PATCH] c99_alloca.h: Include stdlib.h on all non-Windows.

2015-03-03 Thread Brian Paul
On 03/02/2015 10:25 PM, Alan Coopersmith wrote: On 03/ 2/15 08:20 AM, Brian Paul wrote: On 03/01/2015 02:00 PM, Alan Coopersmith wrote: On 03/ 1/15 12:52 PM, Vinson Lee wrote: Fix build on FreeBSD. Bugzilla: https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs.freedesktop.org_show

[Mesa-dev] [PATCH] c99_alloca.h: add case for __sun

2015-03-03 Thread Brian Paul
--- include/c99_alloca.h | 4 1 file changed, 4 insertions(+) diff --git a/include/c99_alloca.h b/include/c99_alloca.h index 575f719..ed66fda 100644 --- a/include/c99_alloca.h +++ b/include/c99_alloca.h @@ -35,6 +35,10 @@ # define alloca _alloca +#elif defined(__sun) + +# include +

Re: [Mesa-dev] [PATCH excerpt] mesa: Wrap unlikely() around conditions leading to _mesa_error().

2015-03-03 Thread Brian Paul
On 03/02/2015 06:56 PM, Matt Turner wrote: On Mon, Mar 2, 2015 at 4:37 PM, Brian Paul wrote: On 03/02/2015 04:03 PM, Eric Anholt wrote: Kenneth Graunke writes: Generated by the following Coccinelle semantic patch: @@ expression E; @@ if ( -E +unlikely(E) ) { ... _mesa_error

[Mesa-dev] replace __FUNCTION__ with __func__ task

2015-03-03 Thread Brian Paul
We're using both of these in Mesa/gallium. It would be nice to consistently just use C99's __func__ everywhere. This would be any easy task for someone looking for something simple to do. We could then get rid of this (broken) chunk seen in both compiler.h and p_compiler.h: #ifndef __FUNCT

Re: [Mesa-dev] replace __FUNCTION__ with __func__ task

2015-03-03 Thread Brian Paul
On 03/03/2015 09:56 AM, Jose Fonseca wrote: On 03/03/15 15:57, Brian Paul wrote: We're using both of these in Mesa/gallium. It would be nice to consistently just use C99's __func__ everywhere. This would be any easy task for someone looking for something simple to do. We could th

[Mesa-dev] [PATCH 5/7] mapi: replace INLINE with inline

2015-03-03 Thread Brian Paul
--- src/mapi/entry.c | 2 +- src/mapi/table.h | 6 +++--- src/mapi/u_compiler.h | 6 -- src/mapi/u_current.h | 4 ++-- src/mapi/u_thread.h | 10 +- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/mapi/entry.c b/src/mapi/entry.c index b6e8db2..f0287

[Mesa-dev] [PATCH 3/7] st/xlib: include p_compiler.h to get PUBLIC definition

2015-03-03 Thread Brian Paul
To prevent build break with following changes. --- src/gallium/state_trackers/glx/xlib/glx_getproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/state_trackers/glx/xlib/glx_getproc.c b/src/gallium/state_trackers/glx/xlib/glx_getproc.c index af7afdb..e7564ad 100644 --- a/src/ga

[Mesa-dev] [PATCH 4/7] mesa: consolidate PUBLIC macro definition

2015-03-03 Thread Brian Paul
Define the macro in src/util/macros.h rather than in two different places. Note that USED isn't actually used anywhere at this time. --- src/gallium/include/pipe/p_compiler.h | 12 src/mesa/main/compiler.h | 20 src/util/macros.h

[Mesa-dev] [PATCH 2/7] mapi: remove unneeded ARRAY_SIZE #define

2015-03-03 Thread Brian Paul
include util/macros.h instead. --- src/mapi/Makefile.am | 1 + src/mapi/shared-glapi/SConscript | 1 + src/mapi/stub.c | 2 +- src/mapi/vgapi/SConscript| 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile

[Mesa-dev] [PATCH 6/7] mapi: use util/macros.h instead of locally defined macros

2015-03-03 Thread Brian Paul
The next step is to get rid of u_compiler.h completely. --- src/mapi/glapi/SConscript | 1 + src/mapi/u_compiler.h | 22 +- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 97ebfe6..f1e9a99 100644 -

[Mesa-dev] [PATCH 7/7] mapi: remove u_compiler.h

2015-03-03 Thread Brian Paul
Just include c99_compat.h or util/macros.h where needed. --- src/mapi/Makefile.sources | 1 - src/mapi/entry.h | 1 - src/mapi/glapi/glapi.h| 1 + src/mapi/mapi.h | 2 -- src/mapi/table.h | 4 +++- src/mapi/u_compiler.h | 7 --- src/mapi/u_current.h | 6

[Mesa-dev] [PATCH 1/7] glx: use ARRAY_SIZE from macros.h

2015-03-03 Thread Brian Paul
--- src/glx/Makefile.am | 1 + src/glx/SConscript | 1 + src/glx/glxclient.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 3ea1b30..6e50e09 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -35,6 +35,7 @@ endif A

[Mesa-dev] [PATCH] gallivm: init MM = NULL to silence warning

2015-03-03 Thread Brian Paul
--- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 5210acc..e2578cf 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++

Re: [Mesa-dev] [PATCH] gallivm: init MM = NULL to silence warning

2015-03-04 Thread Brian Paul
On 03/04/2015 07:08 AM, Jose Fonseca wrote: On 04/03/15 12:58, Jose Fonseca wrote: On 04/03/15 04:20, Matt Turner wrote: On Tue, Mar 3, 2015 at 8:07 PM, Brian Paul wrote: --- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a

Re: [Mesa-dev] [PATCH 1/4] scons: Use -Werror MSVC compatibility flags per-directory.

2015-03-04 Thread Brian Paul
Series LGTM. Reviewed-by: Brian Paul On 03/04/2015 07:27 AM, Jose Fonseca wrote: Matching what we already do with autotools builds. --- scons/gallium.py| 27 --- src/egl/main/SConscript | 2 ++ src/gallium/auxiliary

[Mesa-dev] [PATCH] glx/tests: add -I src/ to fix make check

2015-03-04 Thread Brian Paul
--- src/glx/tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am index dd82449..b02a9e3 100644 --- a/src/glx/tests/Makefile.am +++ b/src/glx/tests/Makefile.am @@ -2,6 +2,7 @@ if HAVE_SHARED_GLAPI AM_CFLAGS = $(PTHREAD_CFLAGS)

Re: [Mesa-dev] [PATCH] glx/tests: add -I src/ to fix make check

2015-03-04 Thread Brian Paul
Right. -Brian On 03/04/2015 10:56 AM, Ian Romanick wrote: Due to 0339e7db, right? If so, Reviewed-by: Ian Romanick On 03/04/2015 09:03 AM, Brian Paul wrote: --- src/glx/tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/glx/tests/Makefile.am b/src/glx/tests

[Mesa-dev] [PATCH 02/12] mesa: include stdio.h where needed

2015-03-04 Thread Brian Paul
Instead of relying on glapi.h or some other header to provide it. --- src/mesa/main/blit.c | 1 + src/mesa/main/debug.c | 1 + src/mesa/main/dlist.h | 2 +- src/mesa/main/errors.c| 1 + src/mesa/main/execmem.c | 1 + src/mesa/main/framebuf

[Mesa-dev] [PATCH 05/12] nouveau: include stdio.h where needed

2015-03-04 Thread Brian Paul
--- src/mesa/drivers/dri/nouveau/nouveau_context.c | 1 + src/mesa/drivers/dri/nouveau/nouveau_driver.c | 1 + src/mesa/drivers/dri/nouveau/nouveau_screen.c | 1 + 3 files changed, 3 insertions(+) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouvea

[Mesa-dev] [PATCH 07/12] st/mesa: include stdio.h where needed

2015-03-04 Thread Brian Paul
--- src/mesa/state_tracker/st_atom.c | 1 + src/mesa/state_tracker/st_cb_texture.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c index 8cc6af2..f0fe11f 100644 --- a/src/mesa/state_tracker/st_atom.c +++ b/src/mesa/sta

[Mesa-dev] [PATCH 03/12] glsl: include stdio.h where needed

2015-03-04 Thread Brian Paul
--- src/glsl/s_expression.cpp | 1 + src/glsl/standalone_scaffolding.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/glsl/s_expression.cpp b/src/glsl/s_expression.cpp index 2928a4d..7eaa491 100644 --- a/src/glsl/s_expression.cpp +++ b/src/glsl/s_expression.cpp @@ -24,6 +24,

[Mesa-dev] [PATCH 04/12] dri/common: include stdio.h where needed

2015-03-04 Thread Brian Paul
--- src/mesa/drivers/dri/common/utils.c | 1 + src/mesa/drivers/dri/common/xmlconfig.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index ccdc971..bb22107 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/

[Mesa-dev] [PATCH 10/12] st/osmesa: include stdio.h

2015-03-04 Thread Brian Paul
--- src/gallium/state_trackers/osmesa/osmesa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/state_trackers/osmesa/osmesa.c b/src/gallium/state_trackers/osmesa/osmesa.c index 4e2b2e0..2d5d096 100644 --- a/src/gallium/state_trackers/osmesa/osmesa.c +++ b/src/gallium/state_tracker

[Mesa-dev] [PATCH 01/12] mesa: include c11/threads.h in mtypes.h

2015-03-04 Thread Brian Paul
Let's directly include c11/threads.h instead of relying on glapi.h to provide it. --- src/mesa/main/mtypes.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 6e99773..efeee8b 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @

[Mesa-dev] [PATCH 09/12] st/xlib: include stdio.h

2015-03-04 Thread Brian Paul
--- src/gallium/state_trackers/glx/xlib/glx_usefont.c | 1 + src/gallium/state_trackers/glx/xlib/xm_api.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c b/src/gallium/state_trackers/glx/xlib/glx_usefont.c index f7ee68b..b3e9c79 100644

[Mesa-dev] [PATCH 11/12] xlib: include stdio.h

2015-03-04 Thread Brian Paul
--- src/mesa/drivers/x11/fakeglx.c | 2 +- src/mesa/drivers/x11/xfonts.c | 1 + src/mesa/drivers/x11/xm_api.c | 1 + src/mesa/drivers/x11/xm_tri.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index 00c583f..

[Mesa-dev] [PATCH 6/7] mapi: use c11 call_once() instead of pthread_once()

2015-03-04 Thread Brian Paul
--- src/mapi/glapi/glapi_entrypoint.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mapi/glapi/glapi_entrypoint.c b/src/mapi/glapi/glapi_entrypoint.c index 53104ce..7facd8a 100644 --- a/src/mapi/glapi/glapi_entrypoint.c +++ b/src/mapi/glapi/glapi_entrypoint.c @@ -29

[Mesa-dev] [PATCH 4/7] mesa: remove THREADS check, printf calls in debug.c

2015-03-04 Thread Brian Paul
THREADS is going away in the next commit. --- src/mesa/main/debug.c | 5 - 1 file changed, 5 deletions(-) diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index eda4937..b50d79e 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -118,11 +118,6 @@ void _mesa_print_info

[Mesa-dev] [PATCH 12/12] osmesa: include stdio.h

2015-03-04 Thread Brian Paul
--- src/mesa/drivers/osmesa/osmesa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 9f1a5a8..022523e 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -33,6 +33,7 @@ */ +#incl

[Mesa-dev] [PATCH 5/7] mapi: THREADS was always defined, remove it

2015-03-04 Thread Brian Paul
THREADS was defined if HAVE_PTHREADS or _WIN32 was defined. That's always the case. The build would die in c11/threads.h otherwise. --- src/mapi/glapi/gen/gl_x86-64_asm.py | 6 +- src/mapi/glapi/gen/gl_x86_asm.py| 14 ++ src/mapi/glapi/glapi.h | 13 ++---

[Mesa-dev] [PATCH 1/7] mapi: remove u_macros.h

2015-03-04 Thread Brian Paul
Only U_STRINGIFY() is used in entry.c --- src/mapi/Makefile.sources | 1 - src/mapi/entry.c| 4 +++- src/mapi/entry_x86-64_tls.h | 1 - src/mapi/entry_x86_tls.h| 1 - src/mapi/entry_x86_tsd.h| 1 - src/mapi/u_macros.h | 12 6 files changed, 3 inserti

[Mesa-dev] [PATCH 08/12] st/xlib: include stdio.h

2015-03-04 Thread Brian Paul
--- src/gallium/state_trackers/glx/xlib/glx_api.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c index f59b0ba..d1bd760 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_api.c +++ b/src/gallium/s

[Mesa-dev] [PATCH 06/12] swrast: include stdio.h where needed

2015-03-04 Thread Brian Paul
--- src/mesa/drivers/dri/swrast/swrast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index b801476..fb29078 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -32,6 +32

[Mesa-dev] [PATCH 2/7] mapi: fix preprocessor check in u_current_destroy()

2015-03-04 Thread Brian Paul
So it matches the preprocessor check around the u_current_init_tsd() code. --- src/mapi/u_current.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mapi/u_current.c b/src/mapi/u_current.c index afa887e..eb77cc7 100644 --- a/src/mapi/u_current.c +++ b/src/mapi/u_current.c @@

[Mesa-dev] [PATCH 7/7] mapi: remove u_thread.h

2015-03-04 Thread Brian Paul
Just use c11 threads directly. --- src/mapi/Makefile.sources | 3 +-- src/mapi/glapi/glapi.h| 1 - src/mapi/mapi.c | 1 - src/mapi/stub.c | 14 +++--- src/mapi/u_current.c | 28 ++-- src/mapi/u_execmem.c | 2 +- 6 files changed,

[Mesa-dev] [PATCH 3/7] mapi: rewrite u_current_init() function without u_thread_self()

2015-03-04 Thread Brian Paul
Remove u_thread_self() since u_thread.h is going away soon. Create a simple thread ID abstraction which wraps WIN32 or c11 threads. This also gets rid of the questionable casting of thrd_t to an unsigned long. --- src/mapi/u_current.c | 43 --- src/mapi/u_th

[Mesa-dev] [PATCH] mapi: actually remove unused u_thread.h

2015-03-05 Thread Brian Paul
..000 --- a/src/mapi/u_thread.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Mesa 3-D graphics library - * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation

Re: [Mesa-dev] [PATCH] c99_alloca.h: Include stdlib.h on all non-Windows.

2015-03-05 Thread Brian Paul
Reviewed-by: Brian Paul On 03/05/2015 08:56 AM, Jon TURNEY wrote: On 01/03/2015 21:00, Alan Coopersmith wrote: On 03/ 1/15 12:52 PM, Vinson Lee wrote: Fix build on FreeBSD. Bugzilla: https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs.freedesktop.org_show-5Fbug.cgi-3Fid-3D89364&a

Re: [Mesa-dev] [PATCH 1/3] mesa: Simplify some tests in update_array_format()

2015-03-05 Thread Brian Paul
On 03/05/2015 03:56 PM, Ian Romanick wrote: On 03/05/2015 10:56 AM, Fredrik Höglund wrote: There is no need to check if these extensions are supported here; if the data type is not supported, we will already have returned a GL_INVALID_ENUM error. From where would GL_INVALID_ENUM have been gen

Re: [Mesa-dev] [PATCH 2/2] glx: remove unneeded ifdef _WIN32 guard

2015-03-06 Thread Brian Paul
/glxclient.h +++ b/src/glx/glxclient.h @@ -47,9 +47,7 @@ #include #include #include -#ifdef _WIN32 #include -#endif #include "GL/glxproto.h" #include "glxconfig.h" #include "glxhash.h" LGTM. I don't think we ever build this on Windo

Re: [Mesa-dev] [PATCH 1/2] util: rework _MSC_VER >= 1200 checks

2015-03-06 Thread Brian Paul
e(expr) assert(expr) Building with this patch now and looks good so far. Reviewed-by: Brian Paul ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/5] egl/main: use c11/threads' mutex directly

2015-03-06 Thread Brian Paul
me. You can re-push with Reviewed-by: Brian Paul < bri...@vmware.com> ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/6] c11: add c11 compatibility wrapper around stdlib.h

2015-03-06 Thread Brian Paul
> > diff --git a/include/c11_stdlib.h b/include/c11_stdlib.h > new file mode 100644 > index 000..04e494f > --- /dev/null > +++ b/include/c11_stdlib.h > @@ -0,0 +1,118 @@ > +/* > + * Mesa 3-D graphics library > + * > + * Copyright (C) 1999-2007 Brian Paul All

Re: [Mesa-dev] [PATCH 1/6] c11: add c11 compatibility wrapper around stdlib.h

2015-03-06 Thread Brian Paul
On Fri, Mar 6, 2015 at 11:26 AM, Brian Paul wrote: > On Fri, Mar 6, 2015 at 9:32 AM, Emil Velikov > wrote: > >> Used for aligned_alloc and other C11 functions missing from the header. >> >> Signed-off-by: Emil Velikov >> --- >> include/c11_stdlib.h | 118

Re: [Mesa-dev] [PATCH 1/6] c11: add c11 compatibility wrapper around stdlib.h

2015-03-07 Thread Brian Paul
On Sat, Mar 7, 2015 at 12:38 PM, Emil Velikov wrote: > > FYI I'm contemplating on about adding a final wrapper - c99_string.h. It > should nuke nearly all of the remaining compiler abstraction that we > have around - mapi, egl, gallium, mesa, glsl... > Yeah, I was looking at doing something like

Re: [Mesa-dev] [PATCH 1/6] c11: add c11 compatibility wrapper around stdlib.h

2015-03-07 Thread Brian Paul
On Sat, Mar 7, 2015 at 1:13 PM, Brian Paul wrote: > On Sat, Mar 7, 2015 at 12:38 PM, Emil Velikov > wrote: > > >> FYI I'm contemplating on about adding a final wrapper - c99_string.h. It >> should nuke nearly all of the remaining compiler abstraction that we >&g

[Mesa-dev] [PATCH] i915: add parens to silence operator precedence warning

2015-03-10 Thread Brian Paul
--- src/mesa/drivers/dri/i915/i915_debug_fp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i915/i915_debug_fp.c b/src/mesa/drivers/dri/i915/i915_debug_fp.c index 3f09902..d107c5a 100644 --- a/src/mesa/drivers/dri/i915/i915_debug_fp.c +++ b/src/mesa/driv

[Mesa-dev] [PATCH 2/4] mesa: reindent querymatrix.c

2015-03-10 Thread Brian Paul
Use 3-space indents, not 4. Move some comments after the case statements. --- src/mesa/main/querymatrix.c | 229 ++-- 1 file changed, 115 insertions(+), 114 deletions(-) diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index 095817c..

[Mesa-dev] [PATCH 4/4] mesa: use ARRAY_SIZE in _mesa_QueryMatrixxOES()

2015-03-10 Thread Brian Paul
--- src/mesa/main/querymatrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index ccd5c5e..18361c9 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -75,7 +75,7 @@ _mesa_QueryMatrixxOES(GL

[Mesa-dev] [PATCH 3/4] mesa: remove register keyword, add const in _mesa_QueryMatrixxOES()

2015-03-10 Thread Brian Paul
--- src/mesa/main/querymatrix.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index ca6b023..ccd5c5e 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -49,13 +49,12 @@ _mesa_QueryMatrix

[Mesa-dev] [PATCH 1/2] st/glx: use strdup() instead of _mesa_strdup()

2015-03-10 Thread Brian Paul
--- src/gallium/state_trackers/glx/xlib/glx_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c index d1bd760..f9572b7 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_api.c +

[Mesa-dev] [PATCH 1/4] mesa: move fpclassify work-arounds into c99_math.h

2015-03-10 Thread Brian Paul
--- include/c99_math.h | 52 + src/mesa/main/querymatrix.c | 51 +--- 2 files changed, 53 insertions(+), 50 deletions(-) diff --git a/include/c99_math.h b/include/c99_math.h index 0a49950..f1a6685 100644

[Mesa-dev] [PATCH 2/2] mesa: use strdup() instead of _mesa_strdup()

2015-03-10 Thread Brian Paul
We were already using strdup() in various places in Mesa. Get rid of the _mesa_strdup() wrapper. All the callers pass a non-NULL argument so the NULL check isn't needed either. --- src/mesa/main/imports.c | 18 -- src/mesa/main/imports.h | 3 --- src/mesa

[Mesa-dev] [PATCH] mesa: remove #define __volatile

2015-03-10 Thread Brian Paul
Not actually used anwhere in Mesa. --- src/mesa/main/compiler.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 95581fb..06c4b5c 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -57,9 +57,6 @@ extern "C" { # el

[Mesa-dev] [PATCH] mesa: remove CPU_TO_LE32() for AIX

2015-03-10 Thread Brian Paul
This is the only remnant of AIX-specific code in Mesa. Probably long unused. --- src/mesa/main/compiler.h | 8 1 file changed, 8 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 06c4b5c..6fded88 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main

[Mesa-dev] [PATCH 6/6] mesa: move __cdecl and LONGSTRING to src/util/macros.h

2015-03-10 Thread Brian Paul
--- src/mesa/main/compiler.h | 21 - src/util/macros.h| 20 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index f56dc3e..b0d8c8f 100644 --- a/src/mesa/main/compiler.h +++ b/src/m

[Mesa-dev] [PATCH 1/6] mesa: PTR_DECL_IN_FRONT is never set, remove related code

2015-03-10 Thread Brian Paul
--- src/mesa/main/compiler.h | 4 1 file changed, 4 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 6fded88..7cd7947 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -124,12 +124,8 @@ extern "C" { #else #define _ASMAPI #endif -#if

[Mesa-dev] [PATCH 3/6] mesa: replace _BLENDAPI with _ASMAPI

2015-03-10 Thread Brian Paul
--- src/mesa/swrast/s_blend.c | 21 + 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c index 7cb1194..a9945f6 100644 --- a/src/mesa/swrast/s_blend.c +++ b/src/mesa/swrast/s_blend.c @@ -48,9 +48,6 @@ #if define

[Mesa-dev] [PATCH 5/6] mesa: replace _ASMAPI with __cdecl

2015-03-10 Thread Brian Paul
__cdecl is the MSVC directive use to indicate caller stack cleanup. We typically annotate code-generated functions with __cdecl so we can use the same code on all platforms. A new #define like CDECL would be nicer, but CDECL is already defined in minwindef.h on Windows. --- src/mesa/main/compiler

[Mesa-dev] [PATCH 2/6] mesa: replace _XFORMAPI with _ASMAPI

2015-03-10 Thread Brian Paul
First step to simplifying _ASMAPI cdecl wrapper macros. Don't bother checking USE_X86_ASM. Just use the cdecl tag all the time as we do in gallium. --- src/mesa/math/m_clip_tmp.h | 8 +++ src/mesa/math/m_norm_tmp.h | 18 +++--- src/mesa/math/m_xform.h | 14 +++ src/mesa

[Mesa-dev] [PATCH 4/6] mesa: remove _ASMAPIP

2015-03-10 Thread Brian Paul
Since removing PTR_DECL_IN_FRONT it's no longer needed. Just use "_ASMAPI *" instead. --- src/mesa/main/compiler.h| 1 - src/mesa/math/m_xform.h | 6 +++--- src/mesa/swrast/s_context.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/me

Re: [Mesa-dev] [PATCH 5/6] mesa: replace _ASMAPI with __cdecl

2015-03-11 Thread Brian Paul
something similar in gallium (grep PIPE_CDECL). Maybe that could be removed too. Anyway, I'll redo this patch series (rm all __cdecl) and do some testing on Windows. -Brian Jose On 11/03/15 01:44, Brian Paul wrote: __cdecl is the MSVC directive use to indicate caller stack cleanu

Re: [Mesa-dev] [PATCH 1/4] mesa: move fpclassify work-arounds into c99_math.h

2015-03-11 Thread Brian Paul
On 03/11/2015 01:23 AM, Jose Fonseca wrote: On 11/03/15 01:41, Brian Paul wrote: --- include/c99_math.h | 52 + src/mesa/main/querymatrix.c | 51 +--- 2 files changed, 53 insertions(+), 50 deletions

Re: [Mesa-dev] [PATCH v1] vbo: improve the code style by adjust the preprocessing c code directives

2015-03-11 Thread Brian Paul
Looks good. I'll push this for you. -Brian On 03/11/2015 03:25 AM, marius.pre...@intel.com wrote: From: Marius Predut Brian Paul review suggestion: there's more macro use here than necessary. Removed and redefine some #define preprocessing directives. Removed the directive input

Re: [Mesa-dev] [PATCH 1/4] mesa: move fpclassify work-arounds into c99_math.h

2015-03-11 Thread Brian Paul
On 03/11/2015 08:20 AM, Brian Paul wrote: On 03/11/2015 01:23 AM, Jose Fonseca wrote: On 11/03/15 01:41, Brian Paul wrote: --- include/c99_math.h | 52 + src/mesa/main/querymatrix.c | 51 +--- 2

Re: [Mesa-dev] [PATCH 5/6] mesa: replace _ASMAPI with __cdecl

2015-03-11 Thread Brian Paul
On 03/11/2015 08:21 AM, Jose Fonseca wrote: On 11/03/15 14:07, Brian Paul wrote: On 03/11/2015 01:29 AM, Jose Fonseca wrote: I don't know the story about this _ASMAPI macro, but __cdecl is also the default calling convention for WIN32: https://msdn.microsoft.com/en-us/library/zkwh89ks

<    4   5   6   7   8   9   10   11   12   13   >