On 11/02/2013 08:41 AM, Chad Versace wrote:
> This clamps GL_MAX_SAMPLES to the given value. If negative, then no
> clamping occurs.
>
> CC: Paul Berry
> CC: Eric Anholt
> Signed-off-by: Chad Versace
> ---
>
>
> This patch lives on my branch driconf-clamp-max_samples.
>
>
> src/mesa/driver
Am 02.11.2013 20:00, schrieb Emil Velikov:
Make automake's subdir-objects work.
Signed-off-by: Emil Velikov
You can drop this and patch 18, I have a patch in the pipeline to
entirely remove vl_winsys_xsp.c.
Just waiting for Mareks patchset to be committed.
Christian.
---
src/gallium/t
Minimise duplication and sources of error
(eg nouveau was missing shared and no-undefined)
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 7 +++
src/gallium/targets/r300/xvmc/Makefile.am | 5 +
src/gallium/targets/r600/xvmc/Makefile.am | 5 +
... and symlink for each target.
Make automake's subdir-objects work for r300.
Signed-off-by: Emil Velikov
---
src/gallium/targets/r300/common/drm_target.c | 54
src/gallium/targets/r300/dri/Makefile.am | 2 +-
src/gallium/targets/r300/dri/drm_target.c| 1 +
* Demangle the large and complex mesa/SConscript.
* Make use of source file lists in Makefile.sources.
* Makes the build systems symmetric.
Signed-off-by: Emil Velikov
---
I've tried squashing mesa & mesa_program into one library,
but my attempts have been futile. Any ideas ?
Cheers
Emil
---
s
Allow the lists to be shared among build systems.
Signed-off-by: Emil Velikov
---
src/gbm/Makefile.am | 15 ++-
src/gbm/Makefile.sources | 8
2 files changed, 14 insertions(+), 9 deletions(-)
create mode 100644 src/gbm/Makefile.sources
diff --git a/src/gbm/Makefile.a
Previous assumption was that the same set of flags can be reused
for both classic and gallium drivers. With megadriver work done
the classic drivers ended up using their own (single) instance of
the flags.
Move these into Automake.inc and rename to indicate that those
are gallium specific. Additio
Make automake's subdir-objects work.
Update includes.
Signed-off-by: Emil Velikov
---
src/gallium/drivers/r300/Makefile.am | 6 +++---
src/gallium/drivers/r300/ralloc.c| 1 +
src/gallium/drivers/r300/register_allocate.c | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 7 +++
src/gallium/targets/r600/xorg/Makefile.am | 2 +-
src/gallium/targets/radeonsi/xorg/Makefile.am | 2 +-
src/gallium/targets/xorg-i915/Makefile.am | 2 +-
src/gallium/targets/xorg-nouveau/Makefile.am
The variable was forgotten during the FEATURE_* removal.
Signed-off-by: Emil Velikov
---
src/mesa/Android.libmesa_dricore.mk | 2 --
src/mesa/Android.libmesa_st_mesa.mk | 2 --
src/mesa/program/Android.mk | 2 --
3 files changed, 6 deletions(-)
diff --git a/src/mesa/Android.libmesa_dric
... and symlink to each target.
Make automake's subdir-objects work for radeonsi.
Signed-off-by: Emil Velikov
---
src/gallium/targets/radeonsi/common/drm_target.c | 69
src/gallium/targets/radeonsi/dri/Makefile.am | 2 +-
src/gallium/targets/radeonsi/dri/drm_target.
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 6 ++
src/gallium/targets/r300/xvmc/Makefile.am | 5 +
src/gallium/targets/r600/xvmc/Makefile.am | 5 +
src/gallium/targets/xvmc-nouveau/Makefile.am | 5 +
src/gallium/targets/xvmc-softpipe/Ma
* minimise flags duplication
* distingush between VISIBILITY C and CXX flags
* set only required flags - C and/or CXX
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 22 ++
src/gallium/drivers/freedreno/Makefile.am | 10 --
src/gallium/driv
Automake.inc already provides GALLIUM_VIDEO_CFLAGS, which
provide the essential compiler flags needed.
Note: this commit adds VISIBILITY_CFLAGS to nouveau and
softpipe.
Signed-off-by: Emil Velikov
---
src/gallium/targets/r300/xvmc/Makefile.am | 8 +---
src/gallium/targets/r600/xvmc/Make
Minimise duplication and discrepencies across xorg targets.
Note: this commit adds VISIBILITY_CFLAGS to nouveau and i915
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 12
src/gallium/targets/r600/xorg/Makefile.am | 8 +---
src/gallium/targ
In order for one to use trace, noop, rbug and/or galahad, they must
set the corresponding GALLIUM_* CFLAG.
Signed-off-by: Emil Velikov
---
src/gallium/targets/r300/vdpau/Makefile.am | 3 ---
src/gallium/targets/r600/vdpau/Makefile.am | 1 -
src/gallium/targets/radeonsi/vdpau/Makefile.am
Make automake's subdir-object work.
Signed-off-by: Emil Velikov
---
src/mesa/x86-64/Makefile.am | 2 +-
src/mesa/x86-64/gen_matypes.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 12 src/mesa/x86-64/gen_matypes.c
diff --git a/src/mesa/x86-64/Makefile.am b/src/mesa/x8
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 7 +++
src/gallium/targets/r300/vdpau/Makefile.am | 10 +++---
src/gallium/targets/r600/vdpau/Makefile.am | 10 +++---
src/gallium/targets/radeonsi/vdpau/Makefile.am | 10 +++---
src/gallium/
Cleanup the duplicating flags and consolidate into a sigle variable.
Note: this patch adds VISIBILITY_CFLAGS to the following targets
* freedreno/drm
* i915/{drm,sw}
* nouveau/drm
* sw/fbdev
* sw/null
* sw/wayland
* sw/wrapper
* sw/xlib
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc
Greatly reduce duplication and provide a sane minimum of
CFLAGS for all DRI targets.
Note: This commit adds VISIBILITY_CFLAGS to the following:
* freedreno
* i915
* ilo
* nouveau
* vmwgfx
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 13 +
src/galli
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 6 ++
src/gallium/targets/r600/xorg/Makefile.am | 5 +
src/gallium/targets/radeonsi/xorg/Makefile.am | 5 +
src/gallium/targets/xorg-i915/Makefile.am | 5 +
src/gallium/targets/xorg-nouveau/Mak
In order to use the trace driver, one needs to define
GALLIUM_TRACE. Neither one of the three targets was
defining it, thus we're safe to remove libtrace.la.
Signed-off-by: Emil Velikov
---
src/gallium/targets/r300/xvmc/Makefile.am| 1 -
src/gallium/targets/r600/xvmc/Makefile.am| 1 -
sr
Store the compiler flags into a variable, in order to minimise
flags duplication (amongst vdpau and xvmc).
Note: this commit add VISIBILITY_CFLAGS to the following targets
* nouveau
* softpipe
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 11 +++
src/g
Make automake's subdir-objects work.
Signed-off-by: Emil Velikov
---
src/gallium/targets/r300/xvmc/Makefile.am | 2 +-
src/gallium/targets/r300/xvmc/vl_winsys_dri.c | 1 +
src/gallium/targets/r600/xvmc/Makefile.am | 2 +-
src/gallium/targets/r600/xvmc/vl_winsys_dri.c | 1
... and symlink to each target.
Make automake's subdir-objects work for r600.
Signed-off-by: Emil Velikov
---
src/gallium/targets/r600/common/drm_target.c | 69
src/gallium/targets/r600/dri/Makefile.am | 2 +-
src/gallium/targets/r600/dri/drm_target.c| 1 +
Signed-off-by: Emil Velikov
---
src/gallium/state_trackers/xvmc/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/gallium/state_trackers/xvmc/Makefile.am
b/src/gallium/state_trackers/xvmc/Makefile.am
index c110912..3968238 100644
--- a/src/gallium/state_trackers/xvmc/Makefile.a
Signed-off-by: Emil Velikov
---
src/gtest/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
index c1f40a7..1a04b92 100644
--- a/src/gtest/Makefile.am
+++ b/src/gtest/Makefile.am
@@ -18,6 +18,8 @@
# LIABILITY, WHETHER IN AN ACTION OF C
Make automake's subdir-objects work.
Signed-off-by: Emil Velikov
---
src/gallium/targets/r300/vdpau/Makefile.am | 2 +-
src/gallium/targets/r300/vdpau/vl_winsys_dri.c | 1 +
src/gallium/targets/r600/vdpau/Makefile.am | 2 +-
src/gallium/targets/r600/vdpau/vl_winsys_dri.c
* Allow the lists to be shared among build systems.
* Update automake and Android build systems.
Signed-off-by: Emil Velikov
---
The Android changes are straight forward, but _not_ tested :(
---
src/mesa/drivers/dri/common/Android.mk | 2 +-
src/mesa/drivers/dri/common/Makefile.am
Signed-off-by: Emil Velikov
---
src/gallium/drivers/freedreno/Makefile.am | 2 ++
src/gallium/drivers/ilo/Makefile.am | 2 ++
src/gallium/drivers/nouveau/Makefile.am | 2 ++
src/gallium/drivers/r300/Makefile.am | 2 ++
src/gallium/drivers/r600/Makefile.am | 2 ++
src/gallium/dri
The variable was forgotten during the FEATURE_* removal.
Signed-off-by: Emil Velikov
---
src/mesa/SConscript | 7 ---
1 file changed, 7 deletions(-)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 4213498..a2bb9f1 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -1
Signed-off-by: Emil Velikov
---
src/gallium/drivers/r300/Makefile.am | 13 ++---
src/gallium/drivers/r300/Makefile.sources | 14 +-
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/gallium/drivers/r300/Makefile.am
b/src/gallium/drivers/r300/Makefile.a
Signed-off-by: Emil Velikov
---
src/gallium/Automake.inc | 7 +++
src/gallium/targets/r300/vdpau/Makefile.am | 5 +
src/gallium/targets/r600/vdpau/Makefile.am | 5 +
src/gallium/targets/radeonsi/vdpau/Makefile.am | 5 +
src/gallium/targets/vdpau-nouve
Rip out the source file list from mesa/Makefile.sources, to a
more sensible location/file.
* Split PROGRAM_FILES and GENERATED_FILES.
* Update the automake and Android build systems.
Android
* Slightly reshuffle the Android.mk for readability sake.
* Use GENERATED_FILES, drop the TODO item.
* Use
* Allow the lists to be shared among build systems.
* *.la files are hangled by top .gitignore, drop local one.
Signed-off-by: Emil Velikov
---
src/gtest/.gitignore | 1 -
src/gtest/Makefile.am | 15 +++
src/gtest/Makefile.sources | 13 +
3 files changed, 16 i
From: Johannes Obermayr
Nearly everything within the three Makefile.am's is identical.
Let's simplify things a little.
v2: Rebase and rewrite the commit message (Emil Velikov)
Signed-off-by: Emil Velikov
---
configure.ac | 2 --
src/gallium/drivers/freed
Signed-off-by: Emil Velikov
---
src/gbm/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 5572fc3..036ecb5 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
include Makef
In a preparation to build common_dri_{drm,sw} is a similar fasion to
other build systems and share the same Makefile.sources.
Signed-off-by: Emil Velikov
---
Strugling to get our custom builder ConvenienceLibrary to build
separate objects, depending on the env. Does anyone have ideas ?
Cheers
Em
Silence automake warnings about missing program/library whenever
the _SOURCES suffix is used for temporary variable names.
warning: variable 'gdi_SOURCES' is defined but no program or
library has 'gdi' as canonical name (possible typo)
Reported-by: Ilia Mirkin
Reported-by: Johannes Obermayr
Hello list,
Here is a follow up patchset to the Makefile.sources, targeting the following
* move source files lists to Makefile.sources (symmetry and reuse accross
build systems)
* creates symlinks and enables subdir-objects (preparation as the option
defaults to enabled with Automake 2.0)
* conso
This clamps GL_MAX_SAMPLES to the given value. If negative, then no
clamping occurs.
CC: Paul Berry
CC: Eric Anholt
Signed-off-by: Chad Versace
---
This patch lives on my branch driconf-clamp-max_samples.
src/mesa/drivers/dri/i965/brw_context.c | 41
src/m
On 11/01/2013 02:37 PM, Paul Berry wrote:
On 31 October 2013 18:36, Chad Versace wrote:
Clamp gen7 GL_MAX_SAMPLES to 0, 4, or 8.
Clamp gen6 GL_MAX_SAMPLES to 0 or 4.
Clamp other gens to 0.
CC: Eric Anholt
Signed-off-by: Chad Versace
---
src/mesa/drivers/dri/i965/brw_context.c | 35
++
On 11/01/2013 02:37 PM, Paul Berry wrote:
On 31 October 2013 18:36, Chad Versace wrote:
This clamps GL_MAX_SAMPLES to the given value. If negative, then no
clamping occurs.
This patch adds the option, but no driver respects it yet.
Do you plan to implement support for this option in all dr
Am 02.11.2013 13:00, schrieb Marek Olšák:
This series removes useless targets from the build system.
The X.Org state tracker doesn't work very well with r600g and radeonsi, and
nowadays we'd like our users to use Glamor and xf86-video-ati anyway.
The video-accel r300g targets are buggy and wil
From: Marek Olšák
---
configure.ac | 3 +-
src/gallium/targets/Makefile.am | 4 --
src/gallium/targets/r300/xvmc/Makefile.am | 69 ---
3 files changed, 1 insertion(+), 75 deletions(-)
delete mode 100644 src/gallium/targets/r30
From: Marek Olšák
---
configure.ac | 3 +-
src/gallium/targets/Makefile.am | 4 -
src/gallium/targets/radeonsi/xorg/Makefile.am | 71 -
src/gallium/targets/radeonsi/xorg/xorg.c | 145 --
4 files changed,
From: Marek Olšák
---
configure.ac | 8 ---
src/gallium/targets/Makefile.am| 4 --
src/gallium/targets/vdpau-softpipe/Makefile.am | 72 --
3 files changed, 84 deletions(-)
delete mode 100644 src/gallium/targets/vdpau-so
From: Marek Olšák
---
configure.ac | 4 --
src/gallium/targets/Makefile.am | 4 --
src/gallium/targets/xvmc-softpipe/Makefile.am | 72 ---
3 files changed, 80 deletions(-)
delete mode 100644 src/gallium/targets/xvmc-softpi
From: Marek Olšák
---
configure.ac | 3 +-
src/gallium/targets/Makefile.am| 4 --
src/gallium/targets/r300/vdpau/Makefile.am | 74 --
3 files changed, 1 insertion(+), 80 deletions(-)
delete mode 100644 src/gallium/targets/r
This series removes useless targets from the build system.
The X.Org state tracker doesn't work very well with r600g and radeonsi, and
nowadays we'd like our users to use Glamor and xf86-video-ati anyway.
The video-accel r300g targets are buggy and will probably never be fixed.
(there are 4 bug
From: Marek Olšák
---
configure.ac | 3 +-
src/gallium/targets/Makefile.am | 4 -
src/gallium/targets/r600/xorg/Makefile.am | 77
src/gallium/targets/r600/xorg/xorg.c | 145 --
4 files changed, 1 insert
51 matches
Mail list logo
