浏览代码

removed clang warning

Nicolas Winkler 5 年之前
父节点
当前提交
49df7fb957

+ 1 - 1
libmandel/src/ClGenerators.cpp

@@ -61,7 +61,7 @@ Device getDevice(Platform& platform, int i, bool display = false) {
 }
 
 
-ClGenerator::ClGenerator(MandelDevice& device, const std::string& source, const mnd::Real& precision) :
+ClGenerator::ClGenerator(mnd::MandelDevice& device, const std::string& source, const mnd::Real& precision) :
     MandelGenerator{ precision },
     device{ device },
     context{ device.getClDevice().context }

+ 1 - 2
libmandel/src/CpuGenerators.cpp

@@ -72,8 +72,7 @@ void CpuGenerator<T, mnd::NONE, parallel>::generate(const mnd::MandelInfo& info,
 #pragma omp parallel for schedule(static, 1) if (parallel)
     for (long j = 0; j < info.bHeight; j++) {
         T y = viewy + T(double(j)) * hpp;
-        long i = 0;
-        for (i; i < info.bWidth; i++) {
+        for (long i = 0; i < info.bWidth; i++) {
             T x = viewx + T(double(i)) * wpp;
 
             T a = x;

+ 3 - 6
libmandel/src/CpuGeneratorsAVX.cpp

@@ -42,8 +42,7 @@ void CpuGenerator<float, mnd::X86_AVX, parallel>::generate(const mnd::MandelInfo
     for (long j = 0; j < info.bHeight; j++) {
         T y = T(view.y) + T(j) * T(view.height / info.bHeight);
         __m256 ys = {y, y, y, y, y, y, y, y};
-        long i = 0;
-        for (i; i < info.bWidth; i += 16) {
+        for (long i = 0; i < info.bWidth; i += 16) {
             __m256 pixc = { float(i), float(i + 1), float(i + 2), float(i + 3), float(i + 4), float(i + 5), float(i + 6), float(i + 7) };
             __m256 pixc2 = { float(i + 8), float(i + 9), float(i + 10), float(i + 11), float(i + 12), float(i + 13), float(i + 14), float(i + 15) };
 
@@ -178,8 +177,7 @@ void CpuGenerator<double, mnd::X86_AVX, parallel>::generate(const mnd::MandelInf
     for (long j = 0; j < info.bHeight; j++) {
         T y = T(view.y + T(j) * view.height / info.bHeight);
         __m256d ys = { y, y, y, y };
-        long i = 0;
-        for (i; i < info.bWidth; i += 8) {
+        for (long i = 0; i < info.bWidth; i += 8) {
             __m256d pixc = { double(i), double(i + 1), double(i + 2), double(i + 3) };
             __m256d pixc2 = { double(i + 4), double(i + 5), double(i + 6), double(i + 7) };
             __m256d xs = _mm256_add_pd(_mm256_mul_pd(dpp, pixc), viewx);
@@ -435,8 +433,7 @@ void CpuGenerator<mnd::DoubleDouble, mnd::X86_AVX, parallel>::generate(const mnd
         __m256d y0s = { y.x[0], y.x[0], y.x[0], y.x[0] };
         __m256d y1s = { y.x[1], y.x[1], y.x[1], y.x[1] };
         AvxDoubleDouble ys{ y0s, y1s };
-        long i = 0;
-        for (i; i < info.bWidth; i += 4) {
+        for (long i = 0; i < info.bWidth; i += 4) {
             T x1 = viewx + T(double(i)) * wpp;
             T x2 = x1 + wpp;
             T x3 = x2 + wpp;

+ 2 - 4
libmandel/src/CpuGeneratorsAVX512.cpp

@@ -35,8 +35,7 @@ void CpuGenerator<float, mnd::X86_AVX_512, parallel>::generate(const mnd::Mandel
     for (long j = 0; j < info.bHeight; j++) {
         T y = T(view.y + double(j) * view.height / info.bHeight);
         __m512 ys = { y, y, y, y, y, y, y, y, y, y, y, y, y, y, y, y };
-        long i = 0;
-        for (i; i < info.bWidth; i += 16) {
+        for (long i = 0; i < info.bWidth; i += 16) {
             __m512 pixc = { float(i), float(i + 1), float(i + 2), float(i + 3), float(i + 4), float(i + 5), float(i + 6), float(i + 7),
                             float(i + 8), float(i + 9), float(i + 10), float(i + 11), float(i + 12), float(i + 13), float(i + 14), float(i + 15) };
             __m512 xs = _mm512_fmadd_ps(dpp, pixc, viewx);
@@ -131,8 +130,7 @@ void CpuGenerator<double, mnd::X86_AVX_512, parallel>::generate(const mnd::Mande
     for (long j = 0; j < info.bHeight; j++) {
         T y = T(view.y + double(j) * view.height / info.bHeight);
         __m512d ys = { y, y, y, y, y, y, y, y };
-        long i = 0;
-        for (i; i < info.bWidth; i += 8) {
+        for (long i = 0; i < info.bWidth; i += 8) {
             __m512d pixc = { double(i), double(i + 1), double(i + 2), double(i + 3), double(i + 4), double(i + 5), double(i + 6), double(i + 7) };
             __m512d xs = _mm512_fmadd_pd(dpp, pixc, viewx);
 

+ 3 - 6
libmandel/src/CpuGeneratorsAVXFMA.cpp

@@ -43,8 +43,7 @@ void CpuGenerator<float, mnd::X86_AVX_FMA, parallel>::generate(const mnd::Mandel
     for (long j = 0; j < info.bHeight; j++) {
         T y = T(view.y) + T(j) * T(view.height / info.bHeight);
         __m256 ys = {y, y, y, y, y, y, y, y};
-        long i = 0;
-        for (i; i < info.bWidth; i += 24) {
+        for (long i = 0; i < info.bWidth; i += 24) {
             __m256 pixc = { float(i), float(i + 1), float(i + 2), float(i + 3), float(i + 4), float(i + 5), float(i + 6), float(i + 7) };
             __m256 pixc2 = { float(i + 8), float(i + 9), float(i + 10), float(i + 11), float(i + 12), float(i + 13), float(i + 14), float(i + 15) };
             __m256 pixc3 = { float(i + 16), float(i + 17), float(i + 18), float(i + 19), float(i + 20), float(i + 21), float(i + 22), float(i + 23) };
@@ -211,8 +210,7 @@ void CpuGenerator<double, mnd::X86_AVX_FMA, parallel>::generate(const mnd::Mande
     for (long j = 0; j < info.bHeight; j++) {
         T y = T(view.y + T(j) * view.height / info.bHeight);
         __m256d ys = { y, y, y, y };
-        long i = 0;
-        for (i; i < info.bWidth; i += 8) {
+        for (long i = 0; i < info.bWidth; i += 8) {
             __m256d pixc = { double(i), double(i + 1), double(i + 2), double(i + 3) };
             __m256d pixc2 = { double(i + 4), double(i + 5), double(i + 6), double(i + 7) };
             __m256d xs = _mm256_fmadd_pd(dpp, pixc, viewx);
@@ -423,8 +421,7 @@ void CpuGenerator<mnd::DoubleDouble, mnd::X86_AVX_FMA, parallel>::generate(const
         __m256d y0s = { y.x[0], y.x[0], y.x[0], y.x[0] };
         __m256d y1s = { y.x[1], y.x[1], y.x[1], y.x[1] };
         AvxDoubleDouble ys{ y0s, y1s };
-        long i = 0;
-        for (i; i < info.bWidth; i += 4) {
+        for (long i = 0; i < info.bWidth; i += 4) {
             T x1 = viewx + T(double(i)) * wpp;
             T x2 = x1 + wpp;
             T x3 = x2 + wpp;

+ 2 - 4
libmandel/src/CpuGeneratorsSSE2.cpp

@@ -38,8 +38,7 @@ void CpuGenerator<float, mnd::X86_SSE2, parallel>::generate(const mnd::MandelInf
     for (long j = 0; j < info.bHeight; j++) {
         T y = T(view.y) + T(j) * T(view.height / info.bHeight);
         __m128 ys = {y, y, y, y};
-        long i = 0;
-        for (i; i < info.bWidth; i += 8) {
+        for (long i = 0; i < info.bWidth; i += 8) {
             __m128 pixc = { float(i), float(i + 1), float(i + 2), float(i + 3) };
             __m128 pixc2 = { float(i + 4), float(i + 5), float(i + 6), float(i + 7) };
             __m128 xs = _mm_add_ps(_mm_mul_ps(dpp, pixc), viewx);
@@ -144,8 +143,7 @@ void CpuGenerator<double, mnd::X86_SSE2, parallel>::generate(const mnd::MandelIn
     for (long j = 0; j < info.bHeight; j++) {
         T y = T(view.y) + T(j) * T(view.height / info.bHeight);
         __m128d ys = { y, y };
-        long i = 0;
-        for (i; i < info.bWidth; i += 4) {
+        for (long i = 0; i < info.bWidth; i += 4) {
             __m128d pixc = { double(i), double(i + 1) };
             __m128d pixc2 = { double(i + 2), double(i + 3) };
             __m128d xs = _mm_add_pd(_mm_mul_pd(dpp, pixc), viewx);