October 2013 - Wine-commits

Alexandre Julliard : configure: Simplify the generation of the install and clean rules.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 204105ade494c93d6cce1026058b7bbc30b0b799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204105ade494c93d6cce10260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:31:33 2013 +0200 configure: Simplify the generation of the install and clean rules. --- Make.rules.in | 2 +- aclocal.m4 | 120 +++++++++++++++++++++++++--------------------- configure | 130 ++++++++++++++++++++++++++------------------------ tools/make_makefiles | 8 +++ 4 files changed, 142 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=204105ade494c93d6cce1…

1 0

Alexandre Julliard : configure: Correctly install binaries even when the tools are disabled.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 62beaad8737b7aac7acc2352933c02e33c1aa9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=62beaad8737b7aac7acc23529… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 7 13:12:25 2013 +0200 configure: Correctly install binaries even when the tools are disabled. --- aclocal.m4 | 14 +++++++------- configure | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 5240a52..3de9199 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -557,23 +557,23 @@ __uninstall__: $ac_dir/__uninstall__" $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" - if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name +"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" fi else wine_fn_append_rule \ -"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" fi - if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) diff --git a/configure b/configure index b53ae91..56f2fab 100755 --- a/configure +++ b/configure @@ -16474,23 +16474,23 @@ __uninstall__: $ac_dir/__uninstall__" $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" - if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name +"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" fi else wine_fn_append_rule \ -"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" fi - if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)

1 0

Alexandre Julliard : configure: Use more user-friendly names for subdirectory targets.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: bedf4757a8b11ce55940bb97289005a79e005cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedf4757a8b11ce55940bb972… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:35:07 2013 +0200 configure: Use more user-friendly names for subdirectory targets. --- Make.rules.in | 6 +- aclocal.m4 | 118 ++++++++++++++++++++++++++++---------------------------- configure | 118 ++++++++++++++++++++++++++++---------------------------- 3 files changed, 121 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bedf4757a8b11ce55940b…

1 0

Alexandre Julliard : configure: Make some shell variables global.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: c48232661d3ac59e5bd7a8569374a83b3da789b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48232661d3ac59e5bd7a8569… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 8 13:20:36 2013 +0200 configure: Make some shell variables global. --- aclocal.m4 | 111 ++++++++++++++++++++++++++--------------------------------- configure | 111 ++++++++++++++++++++++++++--------------------------------- 2 files changed, 98 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c48232661d3ac59e5bd7a…

1 0

Alexandre Julliard : makefiles: Get rid of the recursive installation rules for dlls and programs.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 08eea24b94dc8a238b0af295471f512719acfb55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08eea24b94dc8a238b0af2954… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:41:25 2013 +0200 makefiles: Get rid of the recursive installation rules for dlls and programs. --- Make.rules.in | 3 --- configure | 3 --- configure.ac | 1 - dlls/Makedll.rules.in | 19 ------------------- programs/Makeprog.rules.in | 19 ------------------- 5 files changed, 0 insertions(+), 45 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 2f3f29a..aeb605b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -163,9 +163,6 @@ install-man-pages:: $(MANPAGE) $(DESTDIR)$(mandir)/man$(prog_manext) uninstall-man-pages:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/$(MANPAGE:.man=).$(prog_manext) -install:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in install-man-pages) -uninstall:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in uninstall-man-pages) - .PHONY: install-man-pages uninstall-man-pages # Rules for cleaning diff --git a/configure b/configure index 6c2d41f..602eaca 100755 --- a/configure +++ b/configure @@ -741,7 +741,6 @@ AR BISON FLEX TOOLSDIR -WOW64_DISABLE TARGETFLAGS CPPBIN ac_ct_CXX @@ -4775,8 +4774,6 @@ then as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 fi - WOW64_DISABLE=\# - enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index 763889b..fc4f096 100644 --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,6 @@ then AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) fi - AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index dba64f6..3a226ce 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -16,7 +16,6 @@ IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) IMPLIBFLAGS = $(TARGETFLAGS) $(EXTRAIMPLIBFLAGS) IMPORTLIBFILE = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) -INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(datadir)/wine @MAKE_RULES@ @@ -63,24 +62,6 @@ sgmlpages:: $(C_SRCS) dummy xmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS) -# Rules for installation - -.PHONY: install_dll install_dll.so install_dll.fake - -install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) - -install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so - -install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy - $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) - -install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT) - -uninstall:: - $(RM) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) - # Misc. rules clean:: diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index f72ad2e..802baff 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -11,7 +11,6 @@ DLLFLAGS = @DLLFLAGS@ ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext) @MAKE_RULES@ @@ -20,23 +19,5 @@ all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) $(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) -# Rules for installation - -.PHONY: install_prog install_prog.so install_prog.fake - -install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so - -install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy - $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) - -install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE) - -install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT) - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) - clean:: $(RM) $(MODULE)

1 0

Alexandre Julliard : makefiles: Remove some obsolete rules.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 7260277e1db30d574161a10b8c19b765f0047955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7260277e1db30d574161a10b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 8 10:18:56 2013 +0200 makefiles: Remove some obsolete rules. --- Make.rules.in | 36 +----------------------------------- Make.vars.in | 5 ++--- Makefile.in | 2 -- configure | 50 -------------------------------------------------- configure.ac | 9 --------- 5 files changed, 3 insertions(+), 99 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index aeb605b..db3a45f 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -16,7 +16,6 @@ INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL) DEFS = -D__WINESRC__ $(EXTRADEFS) ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) -ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) @@ -25,7 +24,7 @@ IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=.h) \ $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) -CLEAN_FILES = *.o *.a *.so *.mo *.ln *.res *.fake *.ok *.tab.[ch] *.yy.c +CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \ $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:.idl=_p.c dlldata.c) \ $(PO_SRCS:.rc=.res rsrc.pot) $(MC_SRCS:.mc=.res msg.pot) $(XTEMPLATE_SRCS:.x=.h) @@ -34,12 +33,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) -LINTS = $(C_SRCS:.c=.ln) - -filter: dummy - @$(top_srcdir)/tools/winapi/make_filter --make $(MAKE) all - -.PHONY: all filter # Implicit rules @@ -93,9 +86,6 @@ filter: dummy .idl_t.res: $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $< -.c.ln: - $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) - .c.ok: $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ @@ -119,26 +109,6 @@ filter: dummy dlldata.c: $(WIDL) Makefile.in $(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS) -# Rule for linting - -$(MODULE).ln : $(LINTS) - if test "$(LINTS)" ; \ - then \ - $(LINT) $(ALLLINTFLAGS) -o$(MODULE) $(LINTS) ; \ - $(MV) llib-l$(MODULE).ln $(MODULE).ln ; \ - else \ - $(LINT) $(ALLLINTFLAGS) -C$(MODULE) /dev/null ; \ - fi - -lint:: $(MODULE).ln - -# Rules for Windows API checking - -winapi_check:: dummy - $(WINAPI_CHECK) $(WINAPI_CHECK_FLAGS) $(WINAPI_CHECK_EXTRA_FLAGS) . - -.PHONY: winapi_check - # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ @@ -200,8 +170,4 @@ $(PO_SRCS:.rc=.res): $(ALL_MO_FILES) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_TLB_RES) $(IDL_R_SRCS:.idl=_r.res): $(WIDL) -dummy: - -.PHONY: dummy - # End of global rules diff --git a/Make.vars.in b/Make.vars.in index b5cca68..570009e 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -45,8 +45,6 @@ MKDIR_P = @MKDIR_P@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ PRELINK = @PRELINK@ -LINT = @LINT@ -LINTFLAGS = @LINTFLAGS@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ CONVERT = @CONVERT@ @@ -58,7 +56,6 @@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) PORCFLAGS = @PORCFLAGS@ CROSSAR = $(CROSSTARGET)-ar CROSSRANLIB = $(CROSSTARGET)-ranlib -WINAPI_CHECK = $(top_srcdir)/tools/winapi/winapi_check BUILDIMAGE = $(top_srcdir)/tools/buildimage C2MAN = $(top_srcdir)/tools/c2man.pl RUNTEST = $(top_srcdir)/tools/runtest @@ -89,5 +86,7 @@ conf_manext = 5 @SET_MAKE@ all: +dummy: +.PHONY: all dummy # End of common header diff --git a/Makefile.in b/Makefile.in index a07abd2..7635612 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,8 +35,6 @@ INSTALLDIRS = \ all: wine @echo "Wine build complete." -WINAPI_CHECK_EXTRA_FLAGS = --global - @MAKE_RULES@ # Rules for re-running configure diff --git a/configure b/configure index 602eaca..b022253 100755 --- a/configure +++ b/configure @@ -723,8 +723,6 @@ ICOTOOL CONVERT RSVG FONTFORGE -LINTFLAGS -LINT INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM @@ -5535,54 +5533,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -for ac_prog in lclint lint -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LINT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LINT"; then - ac_cv_prog_LINT="$LINT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LINT="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -LINT=$ac_cv_prog_LINT -if test -n "$LINT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5 -$as_echo "$LINT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$LINT" && break -done - -if test "$LINT" = "lint" -then - LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4" - fi - - for ac_prog in fontforge do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index fc4f096..f407355 100644 --- a/configure.ac +++ b/configure.ac @@ -268,15 +268,6 @@ dnl Use the correct strip to install programs test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" AC_PROG_INSTALL -dnl Check for lint -AC_CHECK_PROGS(LINT, lclint lint) -if test "$LINT" = "lint" -then - LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4" - dnl LINTFLAGS='-D_SIZE_T "-Dsize_t=unsigned long" -errchk=longptr64' -fi -AC_SUBST(LINTFLAGS) - dnl Check for various programs AC_CHECK_PROGS(FONTFORGE, fontforge, false) AC_CHECK_PROGS(RSVG, rsvg, false)

1 0

Henri Verbeet : wined3d: Send texture state updates through the command stream.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 8cf6d1a429428dcd64a3c76f0f0d6a8bf3d6b650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf6d1a429428dcd64a3c76f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:47 2013 +0200 wined3d: Send texture state updates through the command stream. --- dlls/wined3d/cs.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f295aa7..3ddfeb1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -42,6 +42,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_GEOMETRY_SHADER, WINED3D_CS_OP_SET_PIXEL_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, + WINED3D_CS_OP_SET_TEXTURE_STATE, }; struct wined3d_cs_present @@ -151,6 +152,14 @@ struct wined3d_cs_set_render_state DWORD value; }; +struct wined3d_cs_set_texture_state +{ + enum wined3d_cs_op opcode; + UINT stage; + enum wined3d_texture_stage_state state; + DWORD value; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -599,6 +608,28 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render cs->ops->submit(cs); } +static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_texture_state *op = data; + + cs->state.texture_states[op->stage][op->state] = op->value; + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, op->state)); +} + +void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, + enum wined3d_texture_stage_state state, DWORD value) +{ + struct wined3d_cs_set_texture_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TEXTURE_STATE; + op->stage = stage; + op->state = state; + op->value = value; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -617,6 +648,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_GEOMETRY_SHADER */ wined3d_cs_exec_set_geometry_shader, /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, + /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b050cd..73231da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3074,7 +3074,7 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, return; } - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, state)); + wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); } DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b31908d..96e5d3b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2501,6 +2501,8 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, + enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send sampler state updates through the command stream.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: b2e75e27f368852e3c2497c7684d6913c472673a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e75e27f368852e3c2497c76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:48 2013 +0200 wined3d: Send sampler state updates through the command stream. --- dlls/wined3d/cs.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3ddfeb1..af23a47 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -43,6 +43,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_PIXEL_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, + WINED3D_CS_OP_SET_SAMPLER_STATE, }; struct wined3d_cs_present @@ -160,6 +161,14 @@ struct wined3d_cs_set_texture_state DWORD value; }; +struct wined3d_cs_set_sampler_state +{ + enum wined3d_cs_op opcode; + UINT sampler_idx; + enum wined3d_sampler_state state; + DWORD value; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -630,6 +639,28 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, cs->ops->submit(cs); } +static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_sampler_state *op = data; + + cs->state.sampler_states[op->sampler_idx][op->state] = op->value; + device_invalidate_state(cs->device, STATE_SAMPLER(op->sampler_idx)); +} + +void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, + enum wined3d_sampler_state state, DWORD value) +{ + struct wined3d_cs_set_sampler_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SAMPLER_STATE; + op->sampler_idx = sampler_idx; + op->state = state; + op->value = value; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -649,6 +680,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, + /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 73231da..cae3cfd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1990,7 +1990,7 @@ void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, return; } - device_invalidate_state(device, STATE_SAMPLER(sampler_idx)); + wined3d_cs_emit_set_sampler_state(device->cs, sampler_idx, state, value); } DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96e5d3b..9626c54 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2495,6 +2495,8 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, + enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send transformation matrix updates through the command stream.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: c6f8404bb67520abf6a8d12f768c8724fea59033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f8404bb67520abf6a8d12f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:49 2013 +0200 wined3d: Send transformation matrix updates through the command stream. --- dlls/wined3d/cs.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 4 +--- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index af23a47..16ffcf9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -44,6 +44,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, WINED3D_CS_OP_SET_SAMPLER_STATE, + WINED3D_CS_OP_SET_TRANSFORM, }; struct wined3d_cs_present @@ -169,6 +170,13 @@ struct wined3d_cs_set_sampler_state DWORD value; }; +struct wined3d_cs_set_transform +{ + enum wined3d_cs_op opcode; + enum wined3d_transform_state state; + const struct wined3d_matrix *matrix; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -661,6 +669,28 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, cs->ops->submit(cs); } +static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_transform *op = data; + + cs->state.transforms[op->state] = *op->matrix; + if (op->state < WINED3D_TS_WORLD_MATRIX(cs->device->adapter->gl_info.limits.blends)) + device_invalidate_state(cs->device, STATE_TRANSFORM(op->state)); +} + +void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, + const struct wined3d_matrix *matrix) +{ + struct wined3d_cs_set_transform *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TRANSFORM; + op->state = state; + op->matrix = matrix; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -681,6 +711,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, + /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cae3cfd..e37a28d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1360,9 +1360,7 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, } device->state.transforms[d3dts] = *matrix; - - if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends)) - device_invalidate_state(device, STATE_TRANSFORM(d3dts)); + wined3d_cs_emit_set_transform(device->cs, d3dts, matrix); } void CDECL wined3d_device_get_transform(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9626c54..c28643a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2505,6 +2505,8 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, + const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMFaceImpl typedef.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 7320f3b87e68b04df5dd819656131a21c80c78f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7320f3b87e68b04df5dd81965… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:50 2013 +0200 d3drm: Get rid of the IDirect3DRMFaceImpl typedef. --- dlls/d3drm/face.c | 561 +++++++++++++++++++++-------------------------------- 1 files changed, 223 insertions(+), 338 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7320f3b87e68b04df5dd8…

1 0