This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-z64.
commit 0614e47a436173873cb92667da653fb93c4322fe Author: Sven Eckelmann <[email protected]> Date: Wed Oct 10 16:39:50 2012 +0200 Imported Upstream version 1.99.5 --- .hg_archival.txt | 5 +++++ .hgignore | 4 ++++ .hgtags | 2 ++ projects/unix/Makefile | 6 ++++++ src/maingl.cpp | 6 +++--- src/rdp.h | 22 +++++++++++----------- src/rgl.cpp | 2 +- src/rgl_rendermode.cpp | 2 +- 8 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.hg_archival.txt b/.hg_archival.txt new file mode 100644 index 0000000..28d9aba --- /dev/null +++ b/.hg_archival.txt @@ -0,0 +1,5 @@ +repo: 29d6a3861712003358cf3187f7a9736a9f243756 +node: 083703f91ceaa11ef7ded2cd9f695cc4aa667e1a +branch: default +latesttag: 1.99.5 +latesttagdistance: 1 diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000..495a970 --- /dev/null +++ b/.hgignore @@ -0,0 +1,4 @@ +syntax: regexp + +^projects/unix/_obj/ +^projects/unix/mupen64plus-video-z64.so$ diff --git a/.hgtags b/.hgtags new file mode 100644 index 0000000..6e5ca20 --- /dev/null +++ b/.hgtags @@ -0,0 +1,2 @@ +ce1efa043f54c7421e2ee8b95f5c53ea702746c5 1.99.4 +3d6f55e4531cb4f883bca555fea1a1e066d91f82 1.99.5 diff --git a/projects/unix/Makefile b/projects/unix/Makefile index 88fd9a3..edf32c5 100644 --- a/projects/unix/Makefile +++ b/projects/unix/Makefile @@ -300,6 +300,7 @@ targets: @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)" @echo " Debugging Options:" @echo " DEBUG=1 == add debugging symbols" + @echo " LTO=1 == enable experimental build with link-time optimization" @echo " V=1 == show verbose compiler output" all: $(TARGET) @@ -322,6 +323,11 @@ CFLAGS += -MD -include $(OBJECTS:.o=.d) CXXFLAGS += $(CFLAGS) +ifeq ($(LTO), 1) + CFLAGS += -flto + CXXFLAGS += -flto + LDFLAGS += -fuse-linker-plugin $(CXXFLAGS) +endif # standard build rules $(OBJDIR)/%.o: $(SRCDIR)/%.c diff --git a/src/maingl.cpp b/src/maingl.cpp index 4a5feb9..8bccacb 100644 --- a/src/maingl.cpp +++ b/src/maingl.cpp @@ -26,10 +26,10 @@ #define THREADED -#define PLUGIN_VERSION 0x016304 -#define VIDEO_PLUGIN_API_VERSION 0x020000 +#define PLUGIN_VERSION 0x016305 +#define VIDEO_PLUGIN_API_VERSION 0x020100 #define CONFIG_API_VERSION 0x020000 -#define VIDEXT_API_VERSION 0x020100 +#define VIDEXT_API_VERSION 0x020000 #define VERSION_PRINTF_SPLIT(x) (((x) >> 16) & 0xffff), (((x) >> 8) & 0xff), ((x) & 0xff) diff --git a/src/rdp.h b/src/rdp.h index bbad3fd..606ffd0 100644 --- a/src/rdp.h +++ b/src/rdp.h @@ -122,14 +122,14 @@ struct rdpCombineModes_t { #define RDP_GETCM_SUB_B_A1(cm) (((cm).w2 >> 3) & 0x7) #define RDP_GETCM_ADD_A1(cm) (((cm).w2 >> 0) & 0x7) -#define RDP_COMBINE_MASK11 ((0xf<<20)|(0x1f<<15)|(0x7<<12)|(0x7<<9)) -#define RDP_COMBINE_MASK12 ((0xf<<28)|(0x7<<15)|(0x7<<12)|(0x7<<9)) -#define RDP_COMBINE_MASK21 ((0xf<<5)|(0x1f<<0)) -#define RDP_COMBINE_MASK22 ((0xf<<24)|(0x7<<21)|(0x7<<18)|(0x7<<6)|(0x7<<3)|(0x7<<0)) +#define RDP_COMBINE_MASK11 ((0xfu<<20)|(0x1fu<<15)|(0x7u<<12)|(0x7u<<9)) +#define RDP_COMBINE_MASK12 ((0xfu<<28)|(0x7u<<15)|(0x7u<<12)|(0x7u<<9)) +#define RDP_COMBINE_MASK21 ((0xfu<<5)|(0x1fu<<0)) +#define RDP_COMBINE_MASK22 ((0xfu<<24)|(0x7u<<21)|(0x7u<<18)|(0x7u<<6)|(0x7u<<3)|(0x7u<<0)) static const rdpCombineModes_t rdpCombineMasks[4] = { { ~RDP_COMBINE_MASK21, ~RDP_COMBINE_MASK22 }, - { ~0, ~0 }, + { ~0u, ~0u }, { ~(RDP_COMBINE_MASK11|RDP_COMBINE_MASK21), ~(RDP_COMBINE_MASK12|RDP_COMBINE_MASK22) }, { ~(RDP_COMBINE_MASK11|RDP_COMBINE_MASK21), ~(RDP_COMBINE_MASK12|RDP_COMBINE_MASK22) }, }; @@ -181,14 +181,14 @@ struct rdpOtherModes_t { #define RDP_GETOM_DITHER_ALPHA_EN(om) (((om).w2 & 0x02) ? 1 : 0) #define RDP_GETOM_ALPHA_COMPARE_EN(om) (((om).w2 & 0x01) ? 1 : 0) -#define RDP_BLEND_MASK1 ((3<<30)|(3<<26)|(3<<22)|(3<<18)) -#define RDP_BLEND_MASK2 ((3<<28)|(3<<24)|(3<<20)|(3<<16)) +#define RDP_BLEND_MASK1 ((3u<<30)|(3u<<26)|(3u<<22)|(3u<<18)) +#define RDP_BLEND_MASK2 ((3u<<28)|(3u<<24)|(3u<<20)|(3u<<16)) static const rdpOtherModes_t rdpBlendMasks[4] = { - { ~0, ~RDP_BLEND_MASK2 }, - { ~0, ~0 }, - { ~0, ~(RDP_BLEND_MASK1|RDP_BLEND_MASK2) }, - { ~0, ~(RDP_BLEND_MASK1|RDP_BLEND_MASK2) }, + { ~0u, ~RDP_BLEND_MASK2 }, + { ~0u, ~0u }, + { ~0u, ~(RDP_BLEND_MASK1|RDP_BLEND_MASK2) }, + { ~0u, ~(RDP_BLEND_MASK1|RDP_BLEND_MASK2) }, }; struct rdpState_t { diff --git a/src/rgl.cpp b/src/rgl.cpp index 275bba1..c074457 100644 --- a/src/rgl.cpp +++ b/src/rgl.cpp @@ -369,7 +369,7 @@ void rglPrepareFramebuffer(rglRenderBuffer_t & buffer) if (buffer.area.xh == 8192) return; - GLuint restoreId = 0, restoreFbid; + GLuint restoreId = 0, restoreFbid = 0; float d2 = -1; float d = 0; float restoreW = buffer.width+d2, restoreH = buffer.height+d2; diff --git a/src/rgl_rendermode.cpp b/src/rgl_rendermode.cpp index e1a3332..1e190b0 100644 --- a/src/rgl_rendermode.cpp +++ b/src/rgl_rendermode.cpp @@ -212,7 +212,7 @@ void rglSetCombiner(rglRenderChunk_t & chunk, int format) rdpState_t & state = chunk.rdpState; static rglCombiner_t * c; - int cycle = RDP_GETOM_CYCLE_TYPE(state.otherModes); + uint32_t cycle = RDP_GETOM_CYCLE_TYPE(state.otherModes); int i; //, fmt, size; char * p; const char * alphaTest; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
