diff --git a/benchmark/main.c b/benchmark/main.c index eb280d8eb..4de263ac5 100644 --- a/benchmark/main.c +++ b/benchmark/main.c @@ -62,7 +62,7 @@ int GetNumberOfCores() #elif defined( __APPLE__ ) return (int)sysconf( _SC_NPROCESSORS_ONLN ); #elif defined( __linux__ ) - (int)return sysconf( _SC_NPROCESSORS_ONLN ); + return (int)sysconf( _SC_NPROCESSORS_ONLN ); #else return 1; #endif diff --git a/benchmark/n100_avx2/joint_grid.csv b/benchmark/n100_avx2/joint_grid.csv new file mode 100644 index 000000000..c1705932d --- /dev/null +++ b/benchmark/n100_avx2/joint_grid.csv @@ -0,0 +1,5 @@ +threads,fps +1,115.85 +2,209.251 +3,266.537 +4,319.147 diff --git a/benchmark/n100_avx2/large_pyramid.csv b/benchmark/n100_avx2/large_pyramid.csv new file mode 100644 index 000000000..780619503 --- /dev/null +++ b/benchmark/n100_avx2/large_pyramid.csv @@ -0,0 +1,5 @@ +threads,fps +1,133.69 +2,239.395 +3,312.458 +4,360.458 diff --git a/benchmark/n100_avx2/many_pyramids.csv b/benchmark/n100_avx2/many_pyramids.csv new file mode 100644 index 000000000..ca11aef05 --- /dev/null +++ b/benchmark/n100_avx2/many_pyramids.csv @@ -0,0 +1,5 @@ +threads,fps +1,32.0345 +2,56.8865 +3,71.4046 +4,76.2903 diff --git a/benchmark/n100_avx2/smash.csv b/benchmark/n100_avx2/smash.csv new file mode 100644 index 000000000..09be56897 --- /dev/null +++ b/benchmark/n100_avx2/smash.csv @@ -0,0 +1,5 @@ +threads,fps +1,73.9639 +2,115.759 +3,138.925 +4,157.394 diff --git a/benchmark/n100_avx2/tumbler.csv b/benchmark/n100_avx2/tumbler.csv new file mode 100644 index 000000000..0733d28ef --- /dev/null +++ b/benchmark/n100_avx2/tumbler.csv @@ -0,0 +1,5 @@ +threads,fps +1,163.663 +2,261.691 +3,317.057 +4,362.4 diff --git a/benchmark/n100_sse2/joint_grid.csv b/benchmark/n100_sse2/joint_grid.csv new file mode 100644 index 000000000..6762c872a --- /dev/null +++ b/benchmark/n100_sse2/joint_grid.csv @@ -0,0 +1,5 @@ +threads,fps +1,119.293 +2,213.357 +3,268.455 +4,321.339 diff --git a/benchmark/n100_sse2/large_pyramid.csv b/benchmark/n100_sse2/large_pyramid.csv new file mode 100644 index 000000000..67c33d927 --- /dev/null +++ b/benchmark/n100_sse2/large_pyramid.csv @@ -0,0 +1,5 @@ +threads,fps +1,128.152 +2,229.067 +3,302.297 +4,348.367 diff --git a/benchmark/n100_sse2/many_pyramids.csv b/benchmark/n100_sse2/many_pyramids.csv new file mode 100644 index 000000000..e3703b272 --- /dev/null +++ b/benchmark/n100_sse2/many_pyramids.csv @@ -0,0 +1,5 @@ +threads,fps +1,30.9601 +2,55.0378 +3,69.5563 +4,77.3663 diff --git a/benchmark/n100_sse2/smash.csv b/benchmark/n100_sse2/smash.csv new file mode 100644 index 000000000..9c3e0329a --- /dev/null +++ b/benchmark/n100_sse2/smash.csv @@ -0,0 +1,5 @@ +threads,fps +1,73.2282 +2,114.239 +3,137.388 +4,156.341 diff --git a/benchmark/n100_sse2/tumbler.csv b/benchmark/n100_sse2/tumbler.csv new file mode 100644 index 000000000..8e8c31f6c --- /dev/null +++ b/benchmark/n100_sse2/tumbler.csv @@ -0,0 +1,5 @@ +threads,fps +1,161.228 +2,257.781 +3,311.219 +4,356.481 diff --git a/samples/sample_determinism.cpp b/samples/sample_determinism.cpp index d92de3d19..29abdd43c 100644 --- a/samples/sample_determinism.cpp +++ b/samples/sample_determinism.cpp @@ -10,6 +10,7 @@ #include #include +#include // This sample provides a visual representation of the cross platform determinism unit test. // The scenario is designed to produce a chaotic result engaging: diff --git a/samples/settings.cpp b/samples/settings.cpp index c7c25154c..60220a397 100644 --- a/samples/settings.cpp +++ b/samples/settings.cpp @@ -32,7 +32,7 @@ static bool ReadFile( char*& data, int& size, const char* filename ) } data = (char*)malloc( size + 1 ); - fread( data, size, 1, file ); + size_t count = fread( data, size, 1, file ); fclose( file ); data[size] = 0; diff --git a/samples/shader.cpp b/samples/shader.cpp index 81596443f..5c6b910cb 100644 --- a/samples/shader.cpp +++ b/samples/shader.cpp @@ -150,7 +150,7 @@ static GLuint sCreateShaderFromFile( const char* filename, GLenum type ) fseek( file, 0, SEEK_SET ); char* source = static_cast( malloc( size + 1 ) ); - fread( source, size, 1, file ); + size_t count = fread( source, size, 1, file ); fclose( file ); source[size] = 0;