Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename setupInstrinsicPrimitives to setupIntrinsicPrimitives #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename setupInstrinsicPrimitives to setupIntrinsicPrimitives #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/common/primitives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ void x265_setup_primitives(x265_param *param)

#if ENABLE_ASSEMBLY
#if X265_ARCH_X86
setupInstrinsicPrimitives(primitives, param->cpuid);
setupIntrinsicPrimitives(primitives, param->cpuid);
#endif
setupAssemblyPrimitives(primitives, param->cpuid);
#endif
Expand Down
2 changes: 1 addition & 1 deletion source/common/primitives.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ inline int partitionFromLog2Size(int log2Size)
}

void setupCPrimitives(EncoderPrimitives &p);
void setupInstrinsicPrimitives(EncoderPrimitives &p, int cpuMask);
void setupIntrinsicPrimitives(EncoderPrimitives &p, int cpuMask);
void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask);
void setupAliasPrimitives(EncoderPrimitives &p);
#if X265_ARCH_ARM64
Expand Down
2 changes: 1 addition & 1 deletion source/common/vec/vec-primitives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void setupIntrinsicDCT_ssse3(EncoderPrimitives&);
void setupIntrinsicDCT_sse41(EncoderPrimitives&);

/* Use primitives for the best available vector architecture */
void setupInstrinsicPrimitives(EncoderPrimitives &p, int cpuMask)
void setupIntrinsicPrimitives(EncoderPrimitives &p, int cpuMask)
{
#ifdef HAVE_SSE3
if (cpuMask & X265_CPU_SSE3)
Expand Down
4 changes: 2 additions & 2 deletions source/test/testbench.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ int main(int argc, char *argv[])
#if X265_ARCH_X86
EncoderPrimitives vecprim;
memset(&vecprim, 0, sizeof(vecprim));
setupInstrinsicPrimitives(vecprim, test_arch[i].flag);
setupIntrinsicPrimitives(vecprim, test_arch[i].flag);
setupAliasPrimitives(vecprim);
for (size_t h = 0; h < sizeof(harness) / sizeof(TestHarness*); h++)
{
Expand Down Expand Up @@ -237,7 +237,7 @@ int main(int argc, char *argv[])
EncoderPrimitives optprim;
memset(&optprim, 0, sizeof(optprim));
#if X265_ARCH_X86
setupInstrinsicPrimitives(optprim, cpuid);
setupIntrinsicPrimitives(optprim, cpuid);
#endif
setupAssemblyPrimitives(optprim, cpuid);

Expand Down