Carl Worth [Mon, 3 Dec 2012 23:43:16 +0000 (15:43 -0800)]
driconf: Add option definitions to source file, not generated target
For the last two most-recently-added driconf options, their definition was
manually added to options.h, a file which is intended to be automatically
generated, (as part of support for translated driconf option
descriptions). This means that these options would be eliminated if the
generation step were performed again.
Fix this by correctly adding the definitions of these options to t_options.h,
(the file used as input to the generator), and not the options.h file, which
is generated.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tom Stellard [Fri, 11 Jan 2013 17:28:35 +0000 (17:28 +0000)]
targets/opencl: Link against libgallium.la instead of libgallium.a
Tom Stellard [Fri, 11 Jan 2013 17:27:45 +0000 (17:27 +0000)]
drivers/radeon: Don't link against libgallium.la
This fixes several duplicate symbol errors.
libllvmradeon is a simple helper library. If it requires symbols in
other libraries, this should be taken care of by the gallium target that
uses it (e.g. libr600.la)
Matt Turner [Fri, 30 Nov 2012 19:10:20 +0000 (11:10 -0800)]
mesa: Use _mesa_lookup_enum_by_nr in tex*_error_check
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Ian Romanick [Sat, 11 Aug 2012 05:28:27 +0000 (22:28 -0700)]
mesa/es3: Add support for GL_PRIMITIVE_RESTART_FIXED_INDEX
This requires some derived state. The cut vertex used is either the
value specified by glPrimitiveRestartIndex or it's hard-coded to ~0.
The derived state gl_array_attrib::_RestartIndex captures this value.
In addition, the derived state gl_array_attrib::_PrimitiveRestart is set
whenever either gl_array_attrib::PrimitiveRestart or
gl_array_attrib::PrimitiveRestartFixedIndex is set.
v2: Use _mesa_is_gles3.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Ian Romanick [Fri, 9 Nov 2012 18:23:30 +0000 (10:23 -0800)]
i965: Add support for GL_ANY_SAMPLES_PASSED_CONSERVATIVE
We just treat this as an alias for GL_ANY_SAMPLES_PASSED.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Ian Romanick [Sat, 11 Aug 2012 04:38:21 +0000 (21:38 -0700)]
mesa/es3: Add support for GL_ANY_SAMPLES_PASSED_CONSERVATIVE query target
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Ian Romanick [Wed, 8 Aug 2012 20:11:32 +0000 (13:11 -0700)]
mesa/es3: Allow transpose matrix uniforms in GLES3
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Matt Turner [Tue, 27 Nov 2012 20:18:02 +0000 (12:18 -0800)]
glcpp: Reject token pasting operator in GLES
The GLSL ES 3.0 spec (Section 12.17) says:
"GLSL ES 1.00 removed token pasting and other functionality."
NOTE: This is a candidate for the stable branches.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Carl Worth <cworth@cworth.org>
Carl Worth [Mon, 26 Nov 2012 23:00:05 +0000 (15:00 -0800)]
glcpp: Make undefined macros illegal in #if and #elif for GLES3
Simply emitting a nicely-formatted error message if any undefined macro is
encountered in a parser context expecting an expression.
With this commit, the following piglit test now passes:
spec/glsl-es-3.00/compiler/undefined-macro.vert
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Carl Worth [Mon, 26 Nov 2012 22:53:54 +0000 (14:53 -0800)]
glcpp: Add a flag to the parser state to indicate GLES.
This can be triggered either by creation of a GLES context (with
api == API_OPENGLES2) or else by a #version directive with version
value 100 or with a string of "es" following the version value.
There's no behavioral change with this commit—just preparation for ES-specific
behavior in the preprocessor in the future.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Andreas Boll [Fri, 11 Jan 2013 10:46:18 +0000 (11:46 +0100)]
glcpp: Add back tests/*.out to .gitignore
Accidentally removed in
ac2793cf3e1e004942c386dfa45f3b5507223f50
Knut Andre Tidemann [Fri, 11 Jan 2013 09:35:48 +0000 (10:35 +0100)]
targets/egl-static: fix link failure to libwayland-drm
Fixes the following build error:
CXXLD egl_gallium.la
g++: error: ../../../../src/egl/wayland/wayland-drm/.libs/.libs/libwayland-drm.a: No
such file or directory
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
Johannes Obermayr [Fri, 11 Jan 2013 05:06:33 +0000 (06:06 +0100)]
targets/dri-swrast: Force c++ linker in all cases.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=59226
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
Tested-by: Vinson Lee <vlee@freedesktop.org>
Roland Scheidegger [Fri, 11 Jan 2013 02:10:20 +0000 (18:10 -0800)]
llvmpipe: fix clearing integer color buffers
We get int/uint clear color value in this case, and util_pack_color can't
handle these formats at all (even if it could, float input color isn't what
we want).
Pass through the color union appropriately and handle the packing ourselves
(as I couldn't think of a good generic util solution).
This gets piglit fbo_integer_precision_clear and
fbo_integer_readpixels_sint_uint from the ext_texture_integer test group from
segfault to pass (which only leaves fbo-blending from that group not working).
v2: fix up comments
Roland Scheidegger [Wed, 9 Jan 2013 22:38:14 +0000 (14:38 -0800)]
gallivm: fix border color for integer textures
Need to bitcast the float border color (luckily we already get
the color as int just disguised as float).
Fixes piglit texwrap GL_EXT_texture_integer bordercolor.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Roland Scheidegger [Thu, 10 Jan 2013 19:16:40 +0000 (11:16 -0800)]
gallivm: more integer texture format fetch fixes
Change the texel type to int/uint instead of float throughout the sampling
code which makes it easier to catch errors (as llvm will complain about wrong
types if we mistakenly treat these values as real floats somewhere).
This should also get things like e.g. sampler swizzles (for unused channels)
right.
This fixes piglit texture_integer_glsl130 test.
Border color not working (crashing) yet.
(These formats are not exposed yet in llvmpipe.)
v2: couple cleanups according to José's comments
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Matt Turner [Mon, 17 Sep 2012 22:16:06 +0000 (15:16 -0700)]
build: mapi/glapi/gen: Use BUILT_SOURCES
Matt Turner [Mon, 10 Sep 2012 21:31:05 +0000 (14:31 -0700)]
Clean up .gitignore files
Matt Turner [Thu, 6 Sep 2012 03:41:08 +0000 (20:41 -0700)]
Remove MESA_PIC_FLAGS macro
Matt Turner [Thu, 6 Sep 2012 03:39:11 +0000 (20:39 -0700)]
Remove installmesa
Matt Turner [Thu, 6 Sep 2012 03:38:44 +0000 (20:38 -0700)]
Remove minstall
Matt Turner [Thu, 6 Sep 2012 03:37:15 +0000 (20:37 -0700)]
Remove checking for makedepend
Matt Turner [Thu, 6 Sep 2012 03:35:59 +0000 (20:35 -0700)]
Remove gallium's unused Makefile.template
Matt Turner [Thu, 6 Sep 2012 03:35:41 +0000 (20:35 -0700)]
Remove gbm's unused Makefile.template
Matt Turner [Thu, 6 Sep 2012 03:34:53 +0000 (20:34 -0700)]
Remove gallium targets' Makefile.{dri,vdpau,xorg,xvmc}
Matt Turner [Thu, 6 Sep 2012 03:33:11 +0000 (20:33 -0700)]
Remove mklib
Matt Turner [Thu, 6 Sep 2012 03:31:57 +0000 (20:31 -0700)]
Remove unused glsl Makefile.template
Matt Turner [Thu, 6 Sep 2012 03:29:20 +0000 (20:29 -0700)]
Remove configs/{current,default}
Andreas Boll [Tue, 27 Nov 2012 18:18:25 +0000 (19:18 +0100)]
gallium/tests/unit: Convert to automake
Andreas Boll [Mon, 26 Nov 2012 18:58:12 +0000 (19:58 +0100)]
gallium/tests/trivial: Convert to automake
Matt Turner [Thu, 13 Sep 2012 17:45:01 +0000 (10:45 -0700)]
targets/pipe-loader: Convert to automake
C++ linking (controlled by the nodist_EXTRA idiom) is needed
unconditionally for:
nouveau (uses C++ in the driver)
r300 (since LLVM is always required)
radeonsi (since LLVM is always required)
swrast (if builting LLVM pipe)
and conditionally (depends whether LLVM is enabled) for
i915
r600
vmwgfx
and never needed for swrast (softpipe).
Unfortunately, automake seems to *always* link with C++ if nodist_EXTRA
is specified, even inside a false conditional. Not sure if this is a
bug, but it does seem to be weird behavior.
v2: Johannes Obermayr <johannesobermayr@gmx.de>
- Fix some undefined symbols.
v3: Johannes Obermayr <johannesobermayr@gmx.de>
- Install pipe_* to $(libdir)/gallium-pipe.
v4: Johannes Obermayr <johannesobermayr@gmx.de>
- Build it only once on --enable-gallium-gbm / --enable-opencl.
Matt Turner [Thu, 13 Sep 2012 17:10:14 +0000 (10:10 -0700)]
targets/gbm: Convert to automake
Matt Turner [Mon, 10 Sep 2012 18:21:26 +0000 (11:21 -0700)]
targets/egl-static: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
- Add missing Automake.inc
v3: Johannes Obermayr <johannesobermayr@gmx.de>
- Fix linking.
v4: Andreas Boll <andreas.boll.dev@gmail.com>
- Port changes from
ff574d653b0731a324fd30324b0f211502219abf
gallium/egl-static: Fix unresolved symbol 'clock_gettime'
Matt Turner [Fri, 7 Sep 2012 22:24:24 +0000 (15:24 -0700)]
targets/xa-vmwgfx: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Fri, 7 Sep 2012 21:03:27 +0000 (14:03 -0700)]
targets/xvmc-softpipe: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- add missing xvmc state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Fri, 7 Sep 2012 20:56:04 +0000 (13:56 -0700)]
targets/xvmc-r600: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing xvmc state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Fri, 7 Sep 2012 20:53:51 +0000 (13:53 -0700)]
targets/xvmc-r300: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing xvmc state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Fri, 7 Sep 2012 20:50:43 +0000 (13:50 -0700)]
targets/xvmc-nouveau: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing xvmc state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Sat, 8 Sep 2012 03:47:04 +0000 (20:47 -0700)]
build: AC_SUBST XVMC_MAJOR/MINOR
Matt Turner [Fri, 7 Sep 2012 20:25:59 +0000 (13:25 -0700)]
targets/xorg-radeonsi: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Fri, 7 Sep 2012 20:23:50 +0000 (13:23 -0700)]
targets/xorg-r600: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Fri, 7 Sep 2012 20:21:58 +0000 (13:21 -0700)]
targets/xorg-r300: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Fri, 7 Sep 2012 20:19:45 +0000 (13:19 -0700)]
targets/xorg-nouveau: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Thu, 6 Sep 2012 23:56:06 +0000 (16:56 -0700)]
targets/xorg-i915: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 23:52:41 +0000 (16:52 -0700)]
targets/vdpau-softpipe: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing vdpau state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 23:28:35 +0000 (16:28 -0700)]
targets/vdpau-radeonsi: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing vdpau state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 23:12:49 +0000 (16:12 -0700)]
targets/vdpau-r600: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing vdpau state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 22:59:54 +0000 (15:59 -0700)]
targets/vdpau-r300: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing vdpau state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 22:55:49 +0000 (15:55 -0700)]
targets/vdpau-nouveau: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing vdpau state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Thu, 6 Sep 2012 00:06:16 +0000 (17:06 -0700)]
build: AC_SUBST VDPAU_MAJOR/MINOR
Matt Turner [Wed, 5 Sep 2012 22:19:30 +0000 (15:19 -0700)]
targets/libgl-xlib: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 18:19:11 +0000 (11:19 -0700)]
targets/dri-vmwgfx: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 18:17:33 +0000 (11:17 -0700)]
targets/dri-swrast: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 18:14:51 +0000 (11:14 -0700)]
targets/dri-radeonsi: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 18:12:29 +0000 (11:12 -0700)]
targets/dri-r600: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 18:09:53 +0000 (11:09 -0700)]
targets/dri-r300: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 18:07:30 +0000 (11:07 -0700)]
targets/dri-nouveau: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 04:26:39 +0000 (21:26 -0700)]
targets/dri-i915: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
Matt Turner [Wed, 5 Sep 2012 04:57:28 +0000 (21:57 -0700)]
build: Update drivers/Makefile.am to use LTLIBRARIES
Matt Turner [Wed, 5 Sep 2012 04:16:04 +0000 (21:16 -0700)]
state_trackers/xvmc/test: Convert to automake
Matt Turner [Wed, 5 Sep 2012 04:08:19 +0000 (21:08 -0700)]
state_trackers/xvmc: Convert to automake
Matt Turner [Wed, 5 Sep 2012 04:08:19 +0000 (21:08 -0700)]
Remove xvmc hack
Matt Turner [Wed, 5 Sep 2012 03:59:34 +0000 (20:59 -0700)]
state_trackers/xorg: Convert to automake
Matt Turner [Tue, 4 Sep 2012 22:17:11 +0000 (15:17 -0700)]
state_trackers/xa: Convert to automake
Matt Turner [Tue, 4 Sep 2012 20:24:33 +0000 (13:24 -0700)]
state_trackers/vega: Convert to automake
Matt Turner [Tue, 4 Sep 2012 20:13:51 +0000 (13:13 -0700)]
state_trackers/vdpau: Convert to automake
Matt Turner [Tue, 4 Sep 2012 20:13:51 +0000 (13:13 -0700)]
Remove vdpau hack
Matt Turner [Tue, 4 Sep 2012 18:51:36 +0000 (11:51 -0700)]
state_trackers/glx: Convert to automake
Matt Turner [Tue, 4 Sep 2012 18:41:22 +0000 (11:41 -0700)]
state_trackers/gbm: Convert to automake
Matt Turner [Sat, 1 Sep 2012 00:11:35 +0000 (17:11 -0700)]
state_trackers/egl: Convert to automake
Matt Turner [Fri, 31 Aug 2012 22:45:07 +0000 (15:45 -0700)]
state_trackers: Convert to automake
Matt Turner [Fri, 31 Aug 2012 22:40:51 +0000 (15:40 -0700)]
Remove state_tracker/Makefile
Unneeded and unnecessary.
Matt Turner [Fri, 31 Aug 2012 17:51:53 +0000 (10:51 -0700)]
build: Don't build pipebuffer
It's already built by src/gallium/auxiliary.
Tom Stellard [Thu, 30 Aug 2012 16:55:29 +0000 (12:55 -0400)]
radeon/llvm: Convert to Automake
v2: Johannes Obermayr <johannesobermayr@gmx.de>
Fix some undefined symbols.
v3: Johannes Obermayr <johannesobermayr@gmx.de>
Build it -shared to fix egl_gallium.so on r600/radeonsi builds.
Matt Turner [Sat, 8 Sep 2012 04:04:44 +0000 (21:04 -0700)]
build: Add automake conditionals for gallium drivers
Matt Turner [Thu, 30 Aug 2012 03:46:02 +0000 (20:46 -0700)]
state_trackers/dri/sw: Convert to automake
Matt Turner [Thu, 30 Aug 2012 03:34:39 +0000 (20:34 -0700)]
state_trackers/dri/drm: Convert to automake
Matt Turner [Thu, 30 Aug 2012 03:30:22 +0000 (20:30 -0700)]
state_trackers/dri: Convert to automake
Matt Turner [Wed, 29 Aug 2012 22:51:40 +0000 (15:51 -0700)]
winsys/sw/xlib: Convert to automake
Matt Turner [Wed, 29 Aug 2012 22:46:57 +0000 (15:46 -0700)]
winsys/sw/wrapper: Convert to automake
Matt Turner [Wed, 29 Aug 2012 22:44:25 +0000 (15:44 -0700)]
winsys/sw/wayland: Convert to automake
Matt Turner [Wed, 29 Aug 2012 22:32:43 +0000 (15:32 -0700)]
winsys/sw/null: Convert to automake
Matt Turner [Wed, 29 Aug 2012 22:28:45 +0000 (15:28 -0700)]
winsys/sw/fbdev: Convert to automake
Matt Turner [Wed, 29 Aug 2012 22:24:40 +0000 (15:24 -0700)]
winsys/sw/dri: Convert to automake
Matt Turner [Wed, 29 Aug 2012 22:09:30 +0000 (15:09 -0700)]
winsys/sw: Convert to automake
Matt Turner [Wed, 29 Aug 2012 21:48:25 +0000 (14:48 -0700)]
svga/winsys/drm: Convert to automake
Matt Turner [Wed, 29 Aug 2012 21:39:48 +0000 (14:39 -0700)]
nouveau/winsys/drm: Convert to automake
Matt Turner [Wed, 29 Aug 2012 21:29:08 +0000 (14:29 -0700)]
radeonsi: Convert to automake
Can't use LTLIBRARIES here yet, since libradeon isn't converted.
Matt Turner [Wed, 29 Aug 2012 21:14:58 +0000 (14:14 -0700)]
nvc0: Convert to automake
Matt Turner [Wed, 29 Aug 2012 21:10:28 +0000 (14:10 -0700)]
nv50: Convert to automake
Matt Turner [Wed, 29 Aug 2012 21:02:13 +0000 (14:02 -0700)]
nv30: Convert to automake
Matt Turner [Wed, 29 Aug 2012 19:33:57 +0000 (12:33 -0700)]
nouveau: Convert to automake
Matt Turner [Wed, 29 Aug 2012 19:29:47 +0000 (12:29 -0700)]
svga: Convert to automake
Matt Turner [Wed, 29 Aug 2012 19:17:57 +0000 (12:17 -0700)]
softpipe: Convert to automake
Matt Turner [Wed, 29 Aug 2012 19:04:45 +0000 (12:04 -0700)]
llvmpipe: Convert to automake
Matt Turner [Wed, 29 Aug 2012 18:42:45 +0000 (11:42 -0700)]
rbug: Convert to automake
Matt Turner [Wed, 29 Aug 2012 17:53:46 +0000 (10:53 -0700)]
i915/winsys/sw: Convert to automake
Matt Turner [Wed, 29 Aug 2012 17:37:07 +0000 (10:37 -0700)]
i915/winsys/drm: Convert to automake
Matt Turner [Wed, 29 Aug 2012 17:31:29 +0000 (10:31 -0700)]
i915g: Convert to automake
projects / mesa.git / log