Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2015-11-27 01:27:56 +0300
committerMikkel Krautz <mikkel@krautz.dk>2015-11-28 12:05:07 +0300
commit3763d596c689515aac4618719d59227cc4485c06 (patch)
tree0820236876f1aa1e906456df6f468c4c6a0998df /overlay/overlay-shared.pro
parent53a529cb9206dafbecb175de8f59d20addb35200 (diff)
overlay: replace use of Effects11 with direct use of our split HLSL shaders.
Effects11 is quite heavy, in that it pulls D3DCompiler_43.dll (x86) and D3DCompiler_47.dll (x64) into our Mumble installations on Windows. Together, these two DLLs are ~6MB in size. Also, the removal of the Effects11 library itself cuts the sizes of the overlay DLLs by more than half: mumble_ol.dll with Effects11: 407 KB mumble_ol.dll without Effects11: 162 KB mumble_ol_x64.dll with Effects11: 497 KB mumble_ol_x64.dll without Effects11: 211 KB Directly using the split shaders is just as easy, and uses less code than using the Effects11 library. At least for our simple shaders. And we gain a lot from it. Done.
Diffstat (limited to 'overlay/overlay-shared.pro')
-rw-r--r--overlay/overlay-shared.pro13
1 files changed, 0 insertions, 13 deletions
diff --git a/overlay/overlay-shared.pro b/overlay/overlay-shared.pro
index de55bf0fa..2aa897dc0 100644
--- a/overlay/overlay-shared.pro
+++ b/overlay/overlay-shared.pro
@@ -23,22 +23,15 @@ QMAKE_CXXFLAGS_DEBUG -= -MDd
QMAKE_CXXFLAGS_RELEASE *= -MT
QMAKE_CXXFLAGS_DEBUG *= -MTd
-INCLUDEPATH *= "$$FX11DIR/inc"
-
LIBS *= -ldxguid -luuid -lole32 -luser32 -ladvapi32
LIBS *= -ld3d9 -ld3d10 -ld3d11 -ld3dcompiler -ld3dx9 -ld3dx10 -ld3dx11 -ldxgi
CONFIG(force-x86_64-toolchain) {
- LIBS *= -leffects11_x64
DEFINES += USE_MINHOOK
INCLUDEPATH *= ../3rdparty/minhook-src/include
LIBS *= -lminhook
}
-CONFIG(force-x86-toolchain) {
- LIBS *= -leffects11_x86
-}
-
CONFIG(release, debug|release) {
DESTDIR = ../release
QMAKE_LIBDIR += ../release
@@ -63,12 +56,6 @@ fxc.input = EFFECTS
fxc.CONFIG *= no_link target_predeps
QMAKE_EXTRA_COMPILERS *= fxc
-fxc11.output = ${QMAKE_FILE_BASE}11.hex
-fxc11.commands = $${FXC} /Tfx_5_0 /O3 /Fh${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-fxc11.input = EFFECTS
-fxc11.CONFIG *= no_link target_predeps
-QMAKE_EXTRA_COMPILERS *= fxc11
-
vs11.output = ${QMAKE_FILE_BASE}.ps.h
vs11.commands = $${FXC} /Tvs_5_0 /O3 /Vng_vertex_shader /Fh${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
vs11.input = DX11_VERTEX_SHADERS