wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Alexandre Julliard : makefiles: Move the testing rules to the global Make. rules file.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 70251170268826185ce52c8fa2522640cab0522e URL: http://source.winehq.org/git/wine.git/?a=commit;h=70251170268826185ce52c8fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 9 12:16:45 2013 +0200 makefiles: Move the testing rules to the global Make.rules file. --- Make.rules.in | 33 ++++++++++++++++++++++++++++++++- Maketest.rules.in | 51 +++++---------------------------------------------- 2 files changed, 37 insertions(+), 47 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7cd84e6..72d7e00 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -18,16 +18,21 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) +RUNTESTFLAGS = -q -P wine -T $(top_builddir) $(TESTDLL:%=-M %) $(TESTMODULE:%=-p %@DLLEXT@) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.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) +TESTMODULE_STRIPPED = $(TESTMODULE:%.exe=%-stripped.exe@DLLEXT@) +CROSSTESTMODULE = $(TESTMODULE:%_test.exe=%_crosstest.exe) + CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.@IMPLIBEXT@) $(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) + $(PO_SRCS:.rc=.res rsrc.pot) $(MC_SRCS:.mc=.res msg.pot) $(XTEMPLATE_SRCS:.x=.h) \ + $(TESTMODULE:%=% testlist.c) $(CROSSTESTMODULE) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) @@ -153,6 +158,32 @@ depend: dummy .PHONY: depend +# Rules for tests + +$(TESTMODULE) $(TESTMODULE:%=%.so): $(OBJS) Makefile.in + $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) + +$(TESTMODULE_STRIPPED): $(OBJS) Makefile.in + $(WINEGCC) -s -Wb,-F,$(TESTMODULE) $(APPMODE) $(OBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) + +$(CROSSTESTMODULE): $(CROSSOBJS) Makefile.in + $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) + +$(WINETEST_RES): $(TESTMODULE_STRIPPED) + echo "$(TESTMODULE) TESTRES \"$(TESTMODULE_STRIPPED)\"" | $(WRC) $(RCFLAGS) -o $@ + +testlist.c: Makefile.in $(MAKECTESTS) + $(MAKECTESTS) -o $@ $(C_SRCS) + +testlist.o testlist.cross.o: testlist.c $(top_srcdir)/include/wine/test.h + +$(C_SRCS:.c=.ok): $(TESTMODULE:%=%@DLLEXT@) $(TESTDLL:%=../%@DLLEXT@) + +testclean:: + $(RM) *.ok + +.PHONY: check test testclean + # Rules for man pages MANPAGES = $(MANPAGE) $(EXTRA_MANPAGES) diff --git a/Maketest.rules.in b/Maketest.rules.in index f77c7c7..f6d80e5 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -10,57 +10,16 @@ DLLFLAGS = @DLLFLAGS@ TESTMODULE = $(TESTDLL:%.dll=%)_test.exe -TESTRESULTS = $(C_SRCS:.c=.ok) -TESTPROGRAM = $(TESTMODULE)$(DLLEXT) -WINETEST_EXE = $(TESTDLL:%.dll=%)_test-stripped.exe$(DLLEXT) WINETEST_RES = $(top_builddir)/programs/winetest/$(TESTDLL:%.dll=%)_test.res -RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(top_builddir) -p $(TESTPROGRAM) - -ALL_LIBS = $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) EXTRA_OBJS = testlist.o - -CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe MAKEDEPFLAGS = -xo -xcross.o -@MAKE_RULES@ - -all: $(TESTPROGRAM) $(WINETEST_RES) - -$(TESTMODULE) $(TESTMODULE).so: $(OBJS) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) - -$(WINETEST_EXE): $(OBJS) Makefile.in - $(WINEGCC) -s -Wb,-F,$(TESTMODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) - -$(WINETEST_RES): $(WINETEST_EXE) - echo "$(TESTMODULE) TESTRES \"$(WINETEST_EXE)\"" | $(WRC) $(RCFLAGS) -o $@ - -.PHONY: check test testclean crosstest - -# Rules for building test list +all: $(TESTMODULE)$(DLLEXT) $(WINETEST_RES) -testlist.c: Makefile.in $(MAKECTESTS) - $(MAKECTESTS) -o $@ $(C_SRCS) +check test: $(C_SRCS:.c=.ok) -testlist.o testlist.cross.o: testlist.c $(top_srcdir)/include/wine/test.h +crosstest: @CROSSTEST_DISABLE@ $(TESTDLL:%.dll=%)_crosstest.exe -# Rules for testing +.PHONY: check test crosstest -check test: $(TESTRESULTS) - -$(TESTRESULTS): $(TESTMODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) - -# Rules for cross-compiling tests - -crosstest: @CROSSTEST_DISABLE@ $(CROSSTEST) - -$(CROSSTEST): $(CROSSOBJS) Makefile.in - $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) - -# Rules for cleaning - -testclean:: - $(RM) $(TESTRESULTS) - -clean:: - $(RM) testlist.c $(TESTMODULE) $(TESTRESULTS) $(CROSSTEST) +@MAKE_RULES@

1 0

Stefan Dösinger : wined3d: Take sRGB_decode into account in texture_srgb_mode.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 16f7c24296f2fbcfa7d8a18bf0f0a00c340d3e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f7c24296f2fbcfa7d8a18bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 9 12:37:58 2013 +0200 wined3d: Take sRGB_decode into account in texture_srgb_mode. --- dlls/wined3d/texture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 56d13f6..0f3c470 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -658,6 +658,7 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) { + const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; switch (srgb) { case SRGB_RGB: @@ -667,7 +668,8 @@ static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3 return TRUE; default: - return texture->flags & WINED3D_TEXTURE_IS_SRGB; + return !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + && texture->flags & WINED3D_TEXTURE_IS_SRGB; } }

1 0

Alexandre Julliard : makefiles: Move the main module rules to the global Make.rules file.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: fabd3120c599ddd6012ef44c6c14ba0f6b0a9877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabd3120c599ddd6012ef44c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 11:22:18 2013 +0200 makefiles: Move the main module rules to the global Make.rules file. --- Make.rules.in | 7 ++++++- Maketest.rules.in | 14 +++++++------- dlls/Makedll.rules.in | 10 +++------- programs/Makeprog.rules.in | 9 +-------- tools/winegcc/winegcc.c | 1 - 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 07b43c1..7cd84e6 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -25,7 +25,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c -CLEAN_TARGETS = $(IMPORTLIB:%=lib%.@IMPLIBEXT@) $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \ +CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.@IMPLIBEXT@) $(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) @@ -109,6 +109,11 @@ CROSSOBJS = $(OBJS:.o=.cross.o) dlldata.c: $(WIDL) Makefile.in $(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS) +# Rules for main module + +$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) Makefile.in + $(WINEGCC) $(APPMODE) $(MODULEFLAGS) $(OBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) -lwine $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) + # Rules for static libraries all: $(STATICLIB) diff --git a/Maketest.rules.in b/Maketest.rules.in index 7ba3060..f77c7c7 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -9,9 +9,9 @@ # DLLFLAGS = @DLLFLAGS@ -MODULE = $(TESTDLL:%.dll=%)_test.exe +TESTMODULE = $(TESTDLL:%.dll=%)_test.exe TESTRESULTS = $(C_SRCS:.c=.ok) -TESTPROGRAM = $(MODULE)$(DLLEXT) +TESTPROGRAM = $(TESTMODULE)$(DLLEXT) WINETEST_EXE = $(TESTDLL:%.dll=%)_test-stripped.exe$(DLLEXT) WINETEST_RES = $(top_builddir)/programs/winetest/$(TESTDLL:%.dll=%)_test.res RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(top_builddir) -p $(TESTPROGRAM) @@ -26,14 +26,14 @@ MAKEDEPFLAGS = -xo -xcross.o all: $(TESTPROGRAM) $(WINETEST_RES) -$(MODULE) $(MODULE).so: $(OBJS) Makefile.in +$(TESTMODULE) $(TESTMODULE).so: $(OBJS) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINETEST_EXE): $(OBJS) Makefile.in - $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) + $(WINEGCC) -s -Wb,-F,$(TESTMODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINETEST_RES): $(WINETEST_EXE) - echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(WRC) $(RCFLAGS) -o $@ + echo "$(TESTMODULE) TESTRES \"$(WINETEST_EXE)\"" | $(WRC) $(RCFLAGS) -o $@ .PHONY: check test testclean crosstest @@ -48,7 +48,7 @@ testlist.o testlist.cross.o: testlist.c $(top_srcdir)/include/wine/test.h check test: $(TESTRESULTS) -$(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) +$(TESTRESULTS): $(TESTMODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) # Rules for cross-compiling tests @@ -63,4 +63,4 @@ testclean:: $(RM) $(TESTRESULTS) clean:: - $(RM) testlist.c $(MODULE) $(TESTRESULTS) $(CROSSTEST) + $(RM) testlist.c $(TESTMODULE) $(TESTRESULTS) $(CROSSTEST) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 3a6e959..82322e3 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -8,14 +8,10 @@ # DLLFLAGS = @DLLFLAGS@ -BASEMODULE = $(MODULE:%.dll=%) -MAINSPEC = $(BASEMODULE).spec -ALL_LIBS = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) +MAINSPEC = $(MODULE:%.dll=%).spec IDL_TLB_RES = $(IDL_TLB_SRCS:.idl=_t.res) - -@MAKE_RULES@ +MODULEFLAGS = -shared $(srcdir)/$(MAINSPEC) $(EXTRADLLFLAGS) all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) -$(MODULE) $(MODULE).so $(MODULE).fake: $(MAINSPEC) $(OBJS) Makefile.in - $(WINEGCC) -shared $(srcdir)/$(MAINSPEC) $(OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) +@MAKE_RULES@ diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 802baff..1813173 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -10,14 +10,7 @@ # DLLFLAGS = @DLLFLAGS@ -ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) - -@MAKE_RULES@ all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) -$(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) - -clean:: - $(RM) $(MODULE) +@MAKE_RULES@ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index be0d31f..fe0f033 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -930,7 +930,6 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, "kernel32"); add_library(opts, lib_dirs, files, "ntdll"); } - if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); if (!opts->shared && opts->use_msvcrt && opts->target_platform == PLATFORM_CYGWIN) add_library(opts, lib_dirs, files, "msvcrt");

1 0

Alexandre Julliard : makefiles: Move the API documentation rules to the global Make.rules file.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: f94c8669c58aecf4abb8269d8424df210f4b474d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94c8669c58aecf4abb8269d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 8 11:27:13 2013 +0200 makefiles: Move the API documentation rules to the global Make.rules file. --- Make.rules.in | 14 ++++++++++++++ dlls/Makedll.rules.in | 16 ---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 84a05c2..07b43c1 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -162,6 +162,20 @@ uninstall-man-pages:: .PHONY: install-man-pages uninstall-man-pages +# Rules for auto documentation + +manpages:: $(C_SRCS) dummy + $(C2MAN) -o $(top_builddir)/documentation/man$(api_manext) -R$(top_builddir) -C$(srcdir) $(INCLUDES) -S$(api_manext) $(MAINSPEC:%=-w %) $(C_SRCS) + +htmlpages:: $(C_SRCS) dummy + $(C2MAN) -o $(top_builddir)/documentation/html -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(C_SRCS) + +sgmlpages:: $(C_SRCS) dummy + $(C2MAN) -o $(top_builddir)/documentation/api-guide -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(C_SRCS) + +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 cleaning $(EXTRASUBDIRS:%=%/clean): dummy diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 2e23116..3a6e959 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -19,19 +19,3 @@ all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) $(MODULE) $(MODULE).so $(MODULE).fake: $(MAINSPEC) $(OBJS) Makefile.in $(WINEGCC) -shared $(srcdir)/$(MAINSPEC) $(OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) - -# Rules for auto documentation - -manpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/man$(api_manext) -R$(top_builddir) -C$(srcdir) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(C_SRCS) - -htmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/html -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(C_SRCS) - -sgmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/api-guide -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(C_SRCS) - -xmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS) - -# End of global dll rules

1 0

Alexandre Julliard : makefiles: Move the import library rules to the global Make.rules file.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 752b0e02eab20109beeefd897704aa962bc2912e URL: http://source.winehq.org/git/wine.git/?a=commit;h=752b0e02eab20109beeefd897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 23:52:47 2013 +0200 makefiles: Move the import library rules to the global Make.rules file. --- Make.rules.in | 15 ++++++++++++++- aclocal.m4 | 4 ++-- configure | 4 ++-- dlls/Makedll.rules.in | 33 --------------------------------- dlls/krnl386.exe16/Makefile.in | 1 - 5 files changed, 18 insertions(+), 39 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index fb7ac3e..84a05c2 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -25,7 +25,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c -CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \ +CLEAN_TARGETS = $(IMPORTLIB:%=lib%.@IMPLIBEXT@) $(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) @@ -123,6 +123,19 @@ $(STATICLIB:.a=.cross.a): $(CROSSOBJS) Makefile.in $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) $(CROSSRANLIB) $@ +# Rules for import libraries + +$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_SRCS:.c=.o) + $(RM) $@ + $(AR) $(ARFLAGS) $@ $(IMPLIB_SRCS:.c=.o) + $(RANLIB) $@ + +$(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) + $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_SRCS:.c=.o) + +$(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) + $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) + # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ diff --git a/aclocal.m4 b/aclocal.m4 index 30d6827..9e2e147 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -432,8 +432,8 @@ $ac_dir/uninstall:: wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) lib$ac_implib.def +$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT .PHONY: $ac_dir/install-dev $ac_dir/uninstall diff --git a/configure b/configure index b022253..c67e7ba 100755 --- a/configure +++ b/configure @@ -16294,8 +16294,8 @@ fi wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) lib$ac_implib.def +$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT .PHONY: $ac_dir/install-dev $ac_dir/uninstall diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 3a226ce..2e23116 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -12,10 +12,6 @@ BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec ALL_LIBS = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) IDL_TLB_RES = $(IDL_TLB_SRCS:.idl=_t.res) -IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) -IMPLIBFLAGS = $(TARGETFLAGS) $(EXTRAIMPLIBFLAGS) -IMPORTLIBFILE = $(IMPORTLIB:%=lib%.@IMPLIBEXT@) -STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) @MAKE_RULES@ @@ -24,30 +20,6 @@ all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) $(MODULE) $(MODULE).so $(MODULE).fake: $(MAINSPEC) $(OBJS) Makefile.in $(WINEGCC) -shared $(srcdir)/$(MAINSPEC) $(OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) -# Rules for import libraries - -IMPLIB_CROSSOBJS = $(IMPLIB_OBJS:.o=.cross.o) - -.PHONY: $(IMPLIB_SRCS:%=__static_implib__%) - -all: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%) @CROSSTEST_DISABLE@ $(IMPORTLIB:%=lib%.cross.a) - -$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB) - -$(IMPORTLIB:%=lib%.def): $(MAINSPEC) - $(WINEBUILD) $(IMPLIBFLAGS) -w --def -o $@ --export $(srcdir)/$(MAINSPEC) - -$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS) - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(IMPLIB_OBJS) - $(RANLIB) $@ - -$(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_OBJS) - $(WINEBUILD) $(IMPLIBFLAGS) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_OBJS) - -$(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_CROSSOBJS) - $(WINEBUILD) $(IMPLIBFLAGS) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_CROSSOBJS) - # Rules for auto documentation manpages:: $(C_SRCS) dummy @@ -62,9 +34,4 @@ 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) -# Misc. rules - -clean:: - $(RM) $(IMPORTLIBFILE) - # End of global dll rules diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in index 6c7e5ea..4facf93 100644 --- a/dlls/krnl386.exe16/Makefile.in +++ b/dlls/krnl386.exe16/Makefile.in @@ -2,7 +2,6 @@ MODULE = krnl386.exe16 IMPORTLIB = kernel IMPORTS = winecrt0 kernel32 ntdll DELAYIMPORTS = ddraw dsound user32 -EXTRAIMPLIBFLAGS = -m16 EXTRADLLFLAGS = -m16 -nodefaultlibs -Wb,--dll-name,kernel EXTRARCFLAGS = -m16

1 0

Alexandre Julliard : makefiles: Move the static library rules to the global Make.rules file.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: e318b4a59ce238c8418e063c8b9dd9d701603908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e318b4a59ce238c8418e063c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 11:01:58 2013 +0200 makefiles: Move the static library rules to the global Make.rules file. --- Make.rules.in | 14 ++++++++++++++ dlls/Makeimplib.rules.in | 18 ++---------------- dlls/adsiid/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/strmbase/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- libs/port/Makefile.in | 9 +-------- libs/wine/Makefile.in | 6 +----- libs/wpp/Makefile.in | 9 +-------- 13 files changed, 27 insertions(+), 45 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index db3a45f..fb7ac3e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -109,6 +109,20 @@ CROSSOBJS = $(OBJS:.o=.cross.o) dlldata.c: $(WIDL) Makefile.in $(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS) +# Rules for static libraries + +all: $(STATICLIB) + +$(STATICLIB): $(OBJS) Makefile.in + $(RM) $@ + $(AR) $(ARFLAGS) $@ $(OBJS) + $(RANLIB) $@ + +$(STATICLIB:.a=.cross.a): $(CROSSOBJS) Makefile.in + $(RM) $@ + $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) + $(CROSSRANLIB) $@ + # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 5112948..5e59a50 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -9,20 +9,6 @@ DLLFLAGS = @DLLFLAGS@ MAKEDEPFLAGS = -xo -xcross.o -@MAKE_RULES@ - -all: $(MODULE) @CROSSTEST_DISABLE@ $(MODULE:.a=.cross.a) - -# Rules for .a library +@CROSSTEST_DISABLE@ all: $(STATICLIB:.a=.cross.a) -$(MODULE): $(OBJS) Makefile.in - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ - -$(MODULE:.a=.cross.a): $(CROSSOBJS) Makefile.in - $(RM) $@ - $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) - $(CROSSRANLIB) $@ - -# End of global library rules +@MAKE_RULES@ diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index a5b27d5..221f19a 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libadsiid.a +STATICLIB = libadsiid.a C_SRCS = \ adsiid.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index aa46a26..dbd9b02 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr8.a +STATICLIB = libdxerr8.a C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index 57edb14..c85f648 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr9.a +STATICLIB = libdxerr9.a C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index a47a51f..261e0d0 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxguid.a +STATICLIB = libdxguid.a C_SRCS = \ dx10guid.c \ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 3ac7c56..473cbdd 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmbase.a +STATICLIB = libstrmbase.a C_SRCS = \ audio.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 744682e..3ed9247 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmiids.a +STATICLIB = libstrmiids.a C_SRCS = \ strmiids.c diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index bc35e69..904c354 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libuuid.a +STATICLIB = libuuid.a C_SRCS = \ uuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 23dca02..99cd65f 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwinecrt0.a +STATICLIB = libwinecrt0.a C_SRCS = \ delay_load.c \ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 3f42fd4..bcf4c66 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,5 +1,5 @@ DLLFLAGS = @DLLFLAGS@ -MODULE = libwine_port.a +STATICLIB = libwine_port.a C_SRCS = \ ffs.c \ @@ -25,11 +25,4 @@ C_SRCS = \ symlink.c \ usleep.c -all: $(MODULE) - @MAKE_RULES@ - -$(MODULE): $(OBJS) Makefile.in - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index ad9c3c9..24635c1 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,6 +1,7 @@ DLLFLAGS = @DLLFLAGS@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ EXTRADEFS = -DWINE_UNICODE_API="" +STATICLIB = libwine_static.a VERSION = 1.0 SOVERSION = 1 @@ -122,11 +123,6 @@ version.c: dummy $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) -all: libwine_static.a - -libwine_static.a: $(OBJS) Makefile.in - $(AR) $(ARFLAGS) $@ $(OBJS) - # Make sure that make_makefiles sees the generated rules install install-lib:: install install-dev:: diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 4cd080e..668c137 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -1,5 +1,5 @@ DLLFLAGS = @DLLFLAGS@ -MODULE = libwpp.a +STATICLIB = libwpp.a C_SRCS = \ preproc.c \ @@ -8,11 +8,4 @@ C_SRCS = \ LEX_SRCS = ppl.l BISON_SRCS = ppy.y -all: $(MODULE) - @MAKE_RULES@ - -$(MODULE): $(OBJS) - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@

1 0

Henri Verbeet : d3drm: Introduce impl_from_IDirect3DRMVisualArray().
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 44f5d4bd645c6e76202981c0c3717024f0b888e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f5d4bd645c6e76202981c0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:40 2013 +0200 d3drm: Introduce impl_from_IDirect3DRMVisualArray(). --- dlls/d3drm/frame.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 4d8867e..7523eab 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -92,6 +92,11 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); +static inline IDirect3DRMVisualArrayImpl *impl_from_IDirect3DRMVisualArray(IDirect3DRMVisualArray *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DRMVisualArrayImpl, IDirect3DRMVisualArray_iface); +} + static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) { return CONTAINING_RECORD(iface, struct d3drm_light_array, IDirect3DRMLightArray_iface); @@ -235,7 +240,7 @@ static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisua static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* iface) { - IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); @@ -245,7 +250,7 @@ static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* if static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* iface) { - IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); ULONG ref = InterlockedDecrement(&This->ref); ULONG i; @@ -265,7 +270,7 @@ static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* i /*** IDirect3DRMArray methods ***/ static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* iface) { - IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); TRACE("(%p)->() = %d\n", iface, This->size); @@ -276,7 +281,7 @@ static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* i static HRESULT WINAPI IDirect3DRMVisualArrayImpl_GetElement(IDirect3DRMVisualArray *iface, DWORD index, IDirect3DRMVisual **visual) { - IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); TRACE("(%p)->(%u, %p)\n", iface, index, visual);

1 0

Henri Verbeet : wined3d: Unify the shader state IDs.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 079b6d4c11d3c9900fbc5b91e297786545024892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079b6d4c11d3c9900fbc5b91e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:38 2013 +0200 wined3d: Unify the shader state IDs. --- dlls/wined3d/arb_program_shader.c | 152 +++++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 4 +- dlls/wined3d/cs.c | 8 +- dlls/wined3d/glsl_shader.c | 150 +++++++++++++++++----------------- dlls/wined3d/nvidia_texture_shader.c | 4 +- dlls/wined3d/state.c | 16 ++-- dlls/wined3d/utils.c | 23 ++++-- dlls/wined3d/wined3d_private.h | 15 +-- 8 files changed, 189 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=079b6d4c11d3c9900fbc5…

1 0

Henri Verbeet : d3drm: Compare with the correct IID in IDirect3DRMVisualArrayImpl_QueryInterface( ).
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: cd16932bf35846032ec6097d169a73f8b65fdec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd16932bf35846032ec6097d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:39 2013 +0200 d3drm: Compare with the correct IID in IDirect3DRMVisualArrayImpl_QueryInterface(). --- dlls/d3drm/frame.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index fb0c22d..4d8867e 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -215,24 +215,21 @@ static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) return S_OK; } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray* iface, - REFIID riid, void** ret_iface) +static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray *iface, REFIID riid, void **out) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirect3DRMFrameArray)) + if (IsEqualGUID(riid, &IID_IDirect3DRMVisualArray) + || IsEqualGUID(riid, &IID_IUnknown)) { - *ret_iface = iface; IDirect3DRMVisualArray_AddRef(iface); + *out = iface; return S_OK; } - *ret_iface = NULL; - - WARN("Interface %s not implemented\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : wined3d: Send material updates through the command stream.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 1f22246b84a6fa7a88a612be41a5c9edc05460a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f22246b84a6fa7a88a612be4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:37 2013 +0200 wined3d: Send material updates through the command stream. --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 9 ++------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b6542bc..0da79fc 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -46,6 +46,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_SAMPLER_STATE, WINED3D_CS_OP_SET_TRANSFORM, WINED3D_CS_OP_SET_CLIP_PLANE, + WINED3D_CS_OP_SET_MATERIAL, }; struct wined3d_cs_present @@ -185,6 +186,12 @@ struct wined3d_cs_set_clip_plane const struct wined3d_vec4 *plane; }; +struct wined3d_cs_set_material +{ + enum wined3d_cs_op opcode; + const struct wined3d_material *material; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -719,6 +726,25 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const cs->ops->submit(cs); } +static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_material *op = data; + + cs->state.material = *op->material; + device_invalidate_state(cs->device, STATE_MATERIAL); +} + +void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) +{ + struct wined3d_cs_set_material *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_MATERIAL; + op->material = material; + + 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, @@ -741,6 +767,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, + /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, }; 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 1f2642b..20e7927 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1785,15 +1785,10 @@ void CDECL wined3d_device_set_material(struct wined3d_device *device, const stru device->update_state->material = *material; - /* Handle recording of state blocks */ if (device->recording) - { device->recording->changed.material = TRUE; - TRACE("Recording... not performing anything.\n"); - return; - } - - device_invalidate_state(device, STATE_MATERIAL); + else + wined3d_cs_emit_set_material(device->cs, material); } void CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6dc5c7f..e9569ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,6 +2491,7 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013