Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Fred Fonkle
Krita
Commits
f9b08391
Commit
f9b08391
authored
Jan 27, 2017
by
Halla Rempt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build without Vc
parent
35d2722e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
libs/pigment/CMakeLists.txt
libs/pigment/CMakeLists.txt
+1
-7
libs/pigment/compositeops/KoVcMultiArchBuildSupport.h
libs/pigment/compositeops/KoVcMultiArchBuildSupport.h
+5
-1
No files found.
libs/pigment/CMakeLists.txt
View file @
f9b08391
...
...
@@ -96,13 +96,6 @@ endif()
add_library
(
kritapigment SHARED
${
kritapigment_SRCS
}
)
generate_export_header
(
kritapigment
)
if
(
HAVE_VC
)
target_link_libraries
(
kritapigment PUBLIC KF5::I18n KF5::ConfigCore
)
if
(
NOT PACKAGERS_BUILD
)
set_property
(
TARGET kritapigment APPEND PROPERTY COMPILE_OPTIONS
"
${
Vc_ARCHITECTURE_FLAGS
}
"
)
endif
()
endif
()
target_include_directories
(
kritapigment
PUBLIC
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/resources>
...
...
@@ -114,6 +107,7 @@ target_link_libraries( kritapigment
kritaplugin
${
EXTRA_LIBRARIES
}
KF5::I18n
KF5::ConfigCore
Qt5::Core
Qt5::Gui
Qt5::Xml
...
...
libs/pigment/compositeops/KoVcMultiArchBuildSupport.h
View file @
f9b08391
...
...
@@ -91,7 +91,7 @@ createOptimizedClass(typename FactoryType::ParamType param)
qWarning
()
<<
"WARNING: vector instructions disabled by
\'
amdDisableVectorWorkaround
\'
option!"
;
return
FactoryType
::
template
create
<
Vc
::
ScalarImpl
>(
param
);
}
#ifdef HAVE_VC
/**
* We use SSE2, SSSE3, SSE4.1, AVX and AVX2.
* The rest are integer and string instructions mostly.
...
...
@@ -109,8 +109,12 @@ createOptimizedClass(typename FactoryType::ParamType param)
}
else
if
(
Vc
::
isImplementationSupported
(
Vc
::
SSE2Impl
))
{
return
FactoryType
::
template
create
<
Vc
::
SSE2Impl
>(
param
);
}
else
{
#endif
return
FactoryType
::
template
create
<
Vc
::
ScalarImpl
>(
param
);
#ifdef HAVE_VC
}
#endif
}
#else
/* DO_PACKAGERS_BUILD */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment