Jonathan G Rennison
0a9c44d1a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/airport_gui.cpp
# src/blitter/32bpp_anim_sse4.cpp
# src/console_cmds.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/newgrf_object.h
# src/road_gui.cpp
# src/widgets/road_widget.h
# src/window.cpp
2 years ago
Jonathan G Rennison
f9cdb5b610
Fix: Correctly set alpha of output in AlphaBlendTwoPixels
...
Match alpha behaviour of ComposeColourRGBA
2 years ago
glx22
da1a0d042e
Fix: don't use animated SSE4 Draw() when animation is disabled
2 years ago
glx22
bba6ad1f4e
Fix #9935 : Use more selectivity when building SSE specific code
2 years ago
glx22
44e3b05c50
Fix: Use more selectivity when building SSE specific code
...
See: https://github.com/OpenTTD/OpenTTD/issues/9935
(cherry picked from commit c3f55d53405af04bfe928d9e1a815e06c187ca50)
2 years ago
Jonathan G Rennison
ffef1c9e44
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/company_sl.cpp
# src/saveload/engine_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/stdafx.h
# src/table/settings/settings.ini
# src/town_cmd.cpp
# src/vehicle.cpp
3 years ago
Jonathan G Rennison
544da99102
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/cargopacket.h
# src/lang/korean.txt
# src/linkgraph/linkgraph.h
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.h
# src/network/network_admin.h
# src/network/network_func.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/order_base.h
# src/rail_cmd.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/economy_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/signs_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/subsidy_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/script/api/script_object.cpp
# src/settings.cpp
# src/string.cpp
# src/string_func.h
# src/table/CMakeLists.txt
# src/table/settings/settings.ini
# src/viewport_sprite_sorter_sse4.cpp
3 years ago
Jonathan G Rennison
fd605e3cf3
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
3 years ago
Patric Stout
bcd7a7aafe
Codechange: rename _SQ64 into POINTER_IS_64BIT ( #9313 )
3 years ago
rubidium42
ddaedaf32a
Fix: empty undocumented branches
3 years ago
Jonathan G Rennison
4ef363422a
Add 32bpp blitter support for adjusting brightness of drawn sprites
3 years ago
Jonathan G Rennison
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
Jonathan G Rennison
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
17257b9620
Add: 32bpp SSE2 blitter palette animator ( #6795 )
...
Create a new blitter mode: 32bpp-sse2-anim, which is 32bpp-anim + this.
32bpp-sse2-anim is now used by default where 32bpp-anim would have been.
Also use this with the 32bpp-sse4-anim blitter.
See issue #6469 .
6 years ago
Jonathan G Rennison
11a10299d1
Blitter: Also use sprite flags for non-SSE 32bpp sprite encoder
6 years ago
frosch
19188818ea
(svn r27796) -Fix [FS#6545]: 32bpp-anim blitters assumed that pitch and width of the screen were equal.
7 years ago
Jonathan G Rennison
d00fa4d25b
Implement a 32bpp SSE2 palette animator. This is ~4x faster than 32bpp-anim's.
...
Create a new blitter mode: 32bpp-sse2-anim, which is 32bpp-anim + this.
32bpp-sse2-anim is now used by default where 32bpp-anim would have been.
Also use this with the 32bpp-sse4-anim blitter mode.
Fix memory leak in current 32bpp animated blitters.
9 years ago
rubidium
eabb35a874
(svn r26969) -Fix (r26869): black palette didn't work very well with unmasked 32bpp sprites
10 years ago
rubidium
9c31ffd893
(svn r26969) -Fix (r26869): black palette didn't work very well with unmasked 32bpp sprites
10 years ago
rubidium
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
rubidium
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
peter1138
3465686076
(svn r26463) -Fix (r10190ish): Add special handling for PALETTE_CRASH to work for non-8bpp-mapped sprites.
10 years ago
peter1138
209d3e2e9e
(svn r26463) -Fix (r10190ish): Add special handling for PALETTE_CRASH to work for non-8bpp-mapped sprites.
10 years ago
rubidium
4f48e99c64
(svn r26260) -Codechange: add template parameters for (non) translucent and (non) animated sprites, so the least expensive variant can be chosen (MJP)
10 years ago
rubidium
ef9108bd58
(svn r26260) -Codechange: add template parameters for (non) translucent and (non) animated sprites, so the least expensive variant can be chosen (MJP)
10 years ago
rubidium
4585f74faa
(svn r26258) -Codechange: deduplicate Draw methods (MJP)
10 years ago
rubidium
fdf55a1a48
(svn r26258) -Codechange: deduplicate Draw methods (MJP)
10 years ago
rubidium
3df799c1c6
(svn r26257) -Codechange: replace most of the SSE macros by functions
10 years ago
rubidium
f5f4f8a4b3
(svn r26257) -Codechange: replace most of the SSE macros by functions
10 years ago
rubidium
2f3c3d2ba6
(svn r26256) -Codechange: do not load some data when it is not (often) used later on (MJP)
10 years ago
rubidium
3a44e22b1a
(svn r26256) -Codechange: do not load some data when it is not (often) used later on (MJP)
10 years ago
rubidium
d263ec2bd9
(svn r26254) -Codechange: MOVD is better in some cases than PINSRD (MJP)
10 years ago
rubidium
2f7c4f6d12
(svn r26254) -Codechange: MOVD is better in some cases than PINSRD (MJP)
10 years ago
rubidium
d27f085ef6
(svn r26253) -Codechange: remove margin limitation to preserve block type (MJP)
10 years ago
rubidium
5b3b533697
(svn r26253) -Codechange: remove margin limitation to preserve block type (MJP)
10 years ago
rubidium
3f1550ed2f
(svn r26252) -Codechange: deduplicate code for margin case (MJP)
10 years ago
rubidium
7f6e837b3a
(svn r26252) -Codechange: deduplicate code for margin case (MJP)
10 years ago
rubidium
64fb166b74
(svn r26251) -Codechange: prepare Draw code for code deduplication (MJP)
10 years ago
rubidium
9a90bed79b
(svn r26251) -Codechange: prepare Draw code for code deduplication (MJP)
10 years ago
rubidium
0d43f2f437
(svn r26250) -Codechange: deduplicate darkening (e.g. shadow) code (MJP)
10 years ago
rubidium
6e34672c6c
(svn r26250) -Codechange: deduplicate darkening (e.g. shadow) code (MJP)
10 years ago
rubidium
b9823410cc
(svn r26249) -Codechange: simplify/cleanup ALPHA_BLEND macro (MJP)
10 years ago
rubidium
76661f2c56
(svn r26249) -Codechange: simplify/cleanup ALPHA_BLEND macro (MJP)
10 years ago
rubidium
08d405ea09
(svn r26247) -Fix [FS#5854, FS#5855]: Possible out of bounds reads with the sse blitters (MJP)
10 years ago
rubidium
a942619911
(svn r26247) -Fix [FS#5854, FS#5855]: Possible out of bounds reads with the sse blitters (MJP)
10 years ago
planetmaker
b67933bd4d
(svn r26223) -Codechange: Silence some compile warnings about unititialized variables in the SSE blitters (MJP)
11 years ago
planetmaker
7b20da8a0a
(svn r26223) -Codechange: Silence some compile warnings about unititialized variables in the SSE blitters (MJP)
11 years ago
rubidium
dbec2223b1
(svn r26221) -Codechange: normalize constant names in anim-sse4 with the others (MJP)
11 years ago