Mesa (master): radeon/llvm: fix compiling when llvm is active, but opencl isn't

2012-07-17 Thread Christian König
Module: Mesa Branch: master Commit: 4247fd9928b0301a300c0e1e14ed45560e0afc33 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4247fd9928b0301a300c0e1e14ed45560e0afc33 Author: Christian König deathsim...@vodafone.de Date: Fri Jul 13 11:10:37 2012 +0200 radeon/llvm: fix compiling when

Mesa (master): radeonsi: fix vertex element state

2012-07-17 Thread Christian König
Module: Mesa Branch: master Commit: 89e755d7621a15fbf8ad32e6c7b82d4d0ff5b993 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=89e755d7621a15fbf8ad32e6c7b82d4d0ff5b993 Author: Christian König deathsim...@vodafone.de Date: Mon Jul 16 12:07:54 2012 +0200 radeonsi: fix vertex element

Mesa (master): llvmpipe: Fix bug with blend factor in complementary optimisations.

2012-07-17 Thread Jose Fonseca
Module: Mesa Branch: master Commit: e253175c9c8034bfc13ecc3e16ab72007bde744a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e253175c9c8034bfc13ecc3e16ab72007bde744a Author: James Benton jben...@vmware.com Date: Tue Jul 17 12:08:02 2012 +0100 llvmpipe: Fix bug with blend factor in

Mesa (master): wayland: Include wl_drm format enum in wayland-drm.h

2012-07-17 Thread Kristian Høgsberg
Module: Mesa Branch: master Commit: b262f56738fe532bc95b6d2e2d535f832dbbd791 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b262f56738fe532bc95b6d2e2d535f832dbbd791 Author: Kristian Høgsberg k...@bitplanet.net Date: Tue Jul 17 08:30:00 2012 -0400 wayland: Include wl_drm format enum

Mesa (master): gallivm: Allow to force nearest filtering on a per-axis basis.

2012-07-17 Thread Jose Fonseca
Module: Mesa Branch: master Commit: ba9c1773d77afc71adc7bad3d8c326b104c5e094 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba9c1773d77afc71adc7bad3d8c326b104c5e094 Author: José Fonseca jfons...@vmware.com Date: Fri Jul 13 18:27:43 2012 +0100 gallivm: Allow to force nearest

Mesa (master): glx: build tests after libglx.la

2012-07-17 Thread Matt Turner
Module: Mesa Branch: master Commit: f42e601ce0263808ba36c88763196856ecdb79c1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f42e601ce0263808ba36c88763196856ecdb79c1 Author: Matt Turner matts...@gmail.com Date: Mon Jul 16 15:43:42 2012 -0700 glx: build tests after libglx.la

Mesa (master): st/gbm: renaming pitch to stride on gallium

2012-07-17 Thread Kristian Høgsberg
Module: Mesa Branch: master Commit: 23f1e551cc6553ce7f99b9264efc8776f5f35b00 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=23f1e551cc6553ce7f99b9264efc8776f5f35b00 Author: Elvis Lee kwangwoong@lge.com Date: Tue Jul 17 20:28:57 2012 +0900 st/gbm: renaming pitch to stride on

Mesa (master): st/egl: Fix build for wayland includes

2012-07-17 Thread Kristian Høgsberg
Module: Mesa Branch: master Commit: 1f2c87cc8f50d0a0ec3c9be1ddf6cf035002e5c7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f2c87cc8f50d0a0ec3c9be1ddf6cf035002e5c7 Author: Elvis Lee kwangwoong@lge.com Date: Tue Jul 17 20:01:43 2012 +0900 st/egl: Fix build for wayland includes

Mesa (master): gbm: Add gbm_bo_import for gallium gbm backend

2012-07-17 Thread Kristian Høgsberg
Module: Mesa Branch: master Commit: 2023bf996ed5c3797233b8d70670c28e15bdff75 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2023bf996ed5c3797233b8d70670c28e15bdff75 Author: Kristian Høgsberg k...@bitplanet.net Date: Tue Jul 17 10:41:25 2012 -0400 gbm: Add gbm_bo_import for gallium

Mesa (master): gallivm: (trivial) remove unnecessary bogus include

2012-07-17 Thread Roland Scheidegger
Module: Mesa Branch: master Commit: bf484024b944a452e9022a1098313663e0028b29 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf484024b944a452e9022a1098313663e0028b29 Author: Roland Scheidegger srol...@vmware.com Date: Tue Jul 17 17:11:18 2012 +0200 gallivm: (trivial) remove

Mesa (master): intel: Add a function for creating a private window system buffer.

2012-07-17 Thread Chad Versace
Module: Mesa Branch: master Commit: 433ff3e16e8e090fd3a1bf427e61f3e5971a5740 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=433ff3e16e8e090fd3a1bf427e61f3e5971a5740 Author: Eric Anholt e...@anholt.net Date: Wed Jul 4 10:52:31 2012 -0700 intel: Add a function for creating a private

Mesa (master): intel: Convert to using private depth/stencil buffers (v2)

2012-07-17 Thread Chad Versace
Module: Mesa Branch: master Commit: bce58e155db7202a98642c10e6132dee4e08162b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bce58e155db7202a98642c10e6132dee4e08162b Author: Eric Anholt e...@anholt.net Date: Wed Jul 4 10:52:32 2012 -0700 intel: Convert to using private depth/stencil

Mesa (master): intel: Remove dead intel_framebuffer_has_hiz().

2012-07-17 Thread Chad Versace
Module: Mesa Branch: master Commit: 9bbf7c139bb02fe9fc3822bf2ca9ac5963d0d5af URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9bbf7c139bb02fe9fc3822bf2ca9ac5963d0d5af Author: Eric Anholt e...@anholt.net Date: Wed Jul 4 10:52:33 2012 -0700 intel: Remove dead

Mesa (master): intel: Replace the non-getBuffersWithFormat compat path with an error message.

2012-07-17 Thread Chad Versace
Module: Mesa Branch: master Commit: 1b4374d364f877d1b7d01e1231adeee2e0f63a4d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b4374d364f877d1b7d01e1231adeee2e0f63a4d Author: Eric Anholt e...@anholt.net Date: Wed Jul 4 10:52:34 2012 -0700 intel: Replace the non-getBuffersWithFormat

Mesa (master): intel: Drop other checks for old loader version.

2012-07-17 Thread Chad Versace
Module: Mesa Branch: master Commit: 2b311fd8024ab20065568236bdc60b9f69706d4c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b311fd8024ab20065568236bdc60b9f69706d4c Author: Eric Anholt e...@anholt.net Date: Wed Jul 4 10:52:35 2012 -0700 intel: Drop other checks for old loader

Mesa (master): intel: Add a comment explaining why we early return on matching BO names.

2012-07-17 Thread Chad Versace
Module: Mesa Branch: master Commit: fadc9eaf97c0916d5680c1d3b47e80532ede22c1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fadc9eaf97c0916d5680c1d3b47e80532ede22c1 Author: Eric Anholt e...@anholt.net Date: Wed Jul 4 10:52:36 2012 -0700 intel: Add a comment explaining why we early

Mesa (master): configure.ac: Add libLLVMMCJIT to the LLVM_LDFLAGS

2012-07-17 Thread Tom Stellard
Module: Mesa Branch: master Commit: ed41a559dc3293dab75c4f0198531a6f5b870c39 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed41a559dc3293dab75c4f0198531a6f5b870c39 Author: Tom Stellard tstel...@gmail.com Date: Tue Jul 17 14:16:58 2012 + configure.ac: Add libLLVMMCJIT to the

Mesa (master): glsl: Drop obsolete .gitignore entries.

2012-07-17 Thread Michel Dänzer
Module: Mesa Branch: master Commit: 39c4bc7fdf2af0620c36669cca32ea332ff0c8b9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39c4bc7fdf2af0620c36669cca32ea332ff0c8b9 Author: Michel Dänzer michel.daen...@amd.com Date: Tue Jul 17 11:33:01 2012 +0200 glsl: Drop obsolete .gitignore

Mesa (master): configure.ac: Further LLVM fixups.

2012-07-17 Thread Michel Dänzer
Module: Mesa Branch: master Commit: 761131ce4591e5f55f38d13f2c4d2194bc9cb0fd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=761131ce4591e5f55f38d13f2c4d2194bc9cb0fd Author: Michel Dänzer michel.daen...@amd.com Date: Tue Jul 17 18:30:13 2012 +0200 configure.ac: Further LLVM fixups.

Mesa (master): r600g: fix all failing depth-stencil tests for evergreen

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 018e3f75d69490598d61059ece56d379867f3995 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=018e3f75d69490598d61059ece56d379867f3995 Author: Marek Olšák mar...@gmail.com Date: Sun Jul 15 00:02:42 2012 +0200 r600g: fix all failing depth-stencil tests

Mesa (master): gallium/util: add util_bit_last - finds the last bit set in a word

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 6694a68d890a9aa491b5c3e8a576318bb6124e21 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6694a68d890a9aa491b5c3e8a576318bb6124e21 Author: Marek Olšák mar...@gmail.com Date: Fri Mar 30 00:21:11 2012 +0200 gallium/util: add util_bit_last - finds the

Mesa (master): r600g: don' t call inval_shader_cache in r600_context_flush twice

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: f4f2e8ebe1bad91b2c4339a8280d516738bd27d2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4f2e8ebe1bad91b2c4339a8280d516738bd27d2 Author: Marek Olšák mar...@gmail.com Date: Sat Jul 14 04:18:49 2012 +0200 r600g: don't call inval_shader_cache in

Mesa (master): r600g: do fine-grained vertex buffer updates

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 585baac652ffa172fb3fbbdd4c7559d03b7c27ef URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=585baac652ffa172fb3fbbdd4c7559d03b7c27ef Author: Marek Olšák mar...@gmail.com Date: Fri Jul 6 03:18:06 2012 +0200 r600g: do fine-grained vertex buffer updates

Mesa (master): r600g: remove unused flag have_depth_fb

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: d1ca16b2738644d17c10e736ca36981f69f5fa87 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1ca16b2738644d17c10e736ca36981f69f5fa87 Author: Marek Olšák mar...@gmail.com Date: Sat Jul 14 15:34:29 2012 +0200 r600g: remove unused flag have_depth_fb

Mesa (master): r600g: consolidate code for setting sampler views and fix bugs in the process

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: ba48f47ebf7f017db0507b92a3ca83e404dc586c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba48f47ebf7f017db0507b92a3ca83e404dc586c Author: Marek Olšák mar...@gmail.com Date: Sat Jul 14 16:23:42 2012 +0200 r600g: consolidate code for setting sampler

Mesa (master): r600g: don' t invalidate texture caches when setting sampler states

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 883c43cdd48b91faff67fe43512e1225c2f8d877 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=883c43cdd48b91faff67fe43512e1225c2f8d877 Author: Marek Olšák mar...@gmail.com Date: Sat Jul 14 16:36:51 2012 +0200 r600g: don't invalidate texture caches when

Mesa (master): r600g: consolidate and optimize sampler states changes for evergreen

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: e5de73cafdc8febb16d991212b58ad320d67e285 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5de73cafdc8febb16d991212b58ad320d67e285 Author: Marek Olšák mar...@gmail.com Date: Sat Jul 14 16:53:26 2012 +0200 r600g: consolidate and optimize sampler

Mesa (master): r600g: properly track which textures are depth

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 80755ff56317446a8c89e611edc1fdf320d6779b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80755ff56317446a8c89e611edc1fdf320d6779b Author: Marek Olšák mar...@gmail.com Date: Sat Jul 14 17:06:27 2012 +0200 r600g: properly track which textures are

Mesa (master): r600g: only make constant buffers dirty if there' s something to update

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 7022f49b52cb8b414a3716a08deb741cce9ed75c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7022f49b52cb8b414a3716a08deb741cce9ed75c Author: Marek Olšák mar...@gmail.com Date: Sat Jul 14 18:15:29 2012 +0200 r600g: only make constant buffers dirty if

Mesa (master): r600g: convert sampler view emission into atoms

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 5d8d4252f2f6632fc455dcf1079c95495ef445ac URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d8d4252f2f6632fc455dcf1079c95495ef445ac Author: Marek Olšák mar...@gmail.com Date: Sat Jul 14 15:26:59 2012 +0200 r600g: convert sampler view emission into

Mesa (master): r600g: remove unused code after conversion of sampler views

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: c26fadf195876271e559f844c1fc88effa6a60c1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c26fadf195876271e559f844c1fc88effa6a60c1 Author: Marek Olšák mar...@gmail.com Date: Sun Jul 15 02:34:02 2012 +0200 r600g: remove unused code after conversion

Mesa (master): r600g: fix lockups with and enable dual source blending on evergreen

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 9d699cd845f3544fa6e149fa4ffb1d131d32b482 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d699cd845f3544fa6e149fa4ffb1d131d32b482 Author: Marek Olšák mar...@gmail.com Date: Sun Jul 15 03:38:42 2012 +0200 r600g: fix lockups with and enable dual

Mesa (master): gallivm: silence uninitialized variable warnings

2012-07-17 Thread Brian Paul
Module: Mesa Branch: master Commit: c4d2a14d6e98dae29a9a04da122521e25eaf7986 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4d2a14d6e98dae29a9a04da122521e25eaf7986 Author: Brian Paul bri...@vmware.com Date: Tue Jul 17 14:41:29 2012 -0600 gallivm: silence uninitialized variable

Mesa (master): msaa: Generate proper error for operations prohibited on MSAA buffers.

2012-07-17 Thread Paul Berry
Module: Mesa Branch: master Commit: e9b908b014be57cd2d3f0432adf16ac5b9631325 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9b908b014be57cd2d3f0432adf16ac5b9631325 Author: Paul Berry stereotype...@gmail.com Date: Mon Jul 16 11:25:50 2012 -0700 msaa: Generate proper error for

Mesa (master): r600g: init_flushed_depth_texture should be able to report errors

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 611dd529425281d73f1f0ad2000362d4a5525a25 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=611dd529425281d73f1f0ad2000362d4a5525a25 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 00:05:14 2012 +0200 r600g: init_flushed_depth_texture should be

Mesa (master): r600g: remove needless wrapper r600_texture_depth_flush

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: b242adbe5cfa165b252064a1ea36f802d8251ef1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b242adbe5cfa165b252064a1ea36f802d8251ef1 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 00:17:46 2012 +0200 r600g: remove needless wrapper

Mesa (master): r600g: optimize uploading depth textures

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 43e226b6efb77db2247741cc2057d9625a2cfa05 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=43e226b6efb77db2247741cc2057d9625a2cfa05 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 00:32:50 2012 +0200 r600g: optimize uploading depth textures

Mesa (master): r600g: try to fix line stippling with lineloops

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 5130196c0b3cbdb1944918d7f8d4db24d026deea URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5130196c0b3cbdb1944918d7f8d4db24d026deea Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 02:17:10 2012 +0200 r600g: try to fix line stippling with

Mesa (master): r600g: atomize alphatest state

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: bc2f5fc01e678ecd19f921e5bc7bd55c131dde66 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc2f5fc01e678ecd19f921e5bc7bd55c131dde66 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 03:45:25 2012 +0200 r600g: atomize alphatest state ---

Mesa (master): r600g: always derive alphatest state from the first colorbuffer

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: de4fd087cbccd47e703f750968b79525ddbe4554 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de4fd087cbccd47e703f750968b79525ddbe4554 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 04:17:11 2012 +0200 r600g: always derive alphatest state from

Mesa (master): r600g: fix alphatest without a colorbuffer on r6xx-r7xx

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 82a1d241754a52934b41bd152d25741b0c9c6294 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82a1d241754a52934b41bd152d25741b0c9c6294 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 04:31:56 2012 +0200 r600g: fix alphatest without a colorbuffer

Mesa (master): r600g: fix alphatest without a colorbuffer on evergreen

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 1b699a483233d29699865e317f1009a58ebd5416 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b699a483233d29699865e317f1009a58ebd5416 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 05:16:40 2012 +0200 r600g: fix alphatest without a colorbuffer

Mesa (master): r600g: inline r600_context_draw_opaque_count

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: ff9a49328e5d8b647aeb7511a01e5a41592a2799 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff9a49328e5d8b647aeb7511a01e5a41592a2799 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 06:06:01 2012 +0200 r600g: inline r600_context_draw_opaque_count

Mesa (master): r600g: remove debug code for streamout

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 1cfb55c5098e17cd8e6188fc6382b393a9013e4c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1cfb55c5098e17cd8e6188fc6382b393a9013e4c Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 06:12:46 2012 +0200 r600g: remove debug code for streamout ---

Mesa (master): r600g: only set the index type if drawing is indexed

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: d9ba1b0beb6a78e208128e758bd22173fe4a8234 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9ba1b0beb6a78e208128e758bd22173fe4a8234 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 06:13:34 2012 +0200 r600g: only set the index type if drawing is

Mesa (master): r600g: move VGT_STRMOUT_DRAW_OPAQUE_OFFSET initialization into invariant state

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 30257c32910c3f7ac2b9cc24399d6be196d34d26 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=30257c32910c3f7ac2b9cc24399d6be196d34d26 Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 06:18:42 2012 +0200 r600g: move VGT_STRMOUT_DRAW_OPAQUE_OFFSET

Mesa (master): r600g: update R600_MAX_DRAW_CS_DWORDS to take draw-opaque into account

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: f237fd431b512f1d67c88a8d29581b5bef143bbf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f237fd431b512f1d67c88a8d29581b5bef143bbf Author: Marek Olšák mar...@gmail.com Date: Wed Jul 18 06:23:28 2012 +0200 r600g: update R600_MAX_DRAW_CS_DWORDS to

Mesa (master): r600g: accelerate buffer copying

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 8ac9801669c68c33d9dd35a57baf985a4be49eff URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ac9801669c68c33d9dd35a57baf985a4be49eff Author: Marek Olšák mar...@gmail.com Date: Fri Feb 24 02:27:38 2012 +0100 r600g: accelerate buffer copying This will

Mesa (master): r600g: implement wait-free buffer transfer for DISCARD_RANGE

2012-07-17 Thread Marek Olšák
Module: Mesa Branch: master Commit: 99c65bac341f808279a8a847158ace4f058aa72e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99c65bac341f808279a8a847158ace4f058aa72e Author: Marek Olšák mar...@gmail.com Date: Sun Feb 26 20:37:43 2012 +0100 r600g: implement wait-free buffer transfer