diff options
| author | Yong He <yonghe@outlook.com> | 2017-11-04 18:07:09 -0400 |
|---|---|---|
| committer | Yong He <yonghe@outlook.com> | 2017-11-04 18:07:09 -0400 |
| commit | d1009d1a5ac7463dc74169ed7c6e1e692b3541d7 (patch) | |
| tree | b21cd74ca6daabd655f5a2625c2698de16a92dd1 /tools/render-test | |
| parent | 1f9686ce87573efdd4ad56040deb2d424fe51929 (diff) | |
| parent | 784bd914cface6e5837ef0da7aee0df2e16c4999 (diff) | |
merge with fixWarnings branch
Diffstat (limited to 'tools/render-test')
| -rw-r--r-- | tools/render-test/render-d3d11.cpp | 2 | ||||
| -rw-r--r-- | tools/render-test/render-gl.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/render-test/render-d3d11.cpp b/tools/render-test/render-d3d11.cpp index 4b61b57c3..47f486a0d 100644 --- a/tools/render-test/render-d3d11.cpp +++ b/tools/render-test/render-d3d11.cpp @@ -1089,7 +1089,7 @@ public: } else { - printf("invalid output type at %d.\n"); + printf("invalid output type at %d.\n", id); } } id++; diff --git a/tools/render-test/render-gl.cpp b/tools/render-test/render-gl.cpp index a853a53a4..f07e27985 100644 --- a/tools/render-test/render-gl.cpp +++ b/tools/render-test/render-gl.cpp @@ -8,6 +8,7 @@ #include <stdio.h> #include <stdlib.h> #include "core/basic.h" +#include "core/secure-crt.h" #include "external/stb/stb_image_write.h" // TODO(tfoley): eventually we should be able to run these @@ -736,7 +737,7 @@ public: { glSamplerParameteri(rs.handle, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glSamplerParameteri(rs.handle, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glSamplerParameteri(rs.handle, GL_TEXTURE_MAX_ANISOTROPY_EXT, 8.0f); + glSamplerParameteri(rs.handle, GL_TEXTURE_MAX_ANISOTROPY_EXT, 8); } else { @@ -802,7 +803,8 @@ public: virtual void serializeOutput(BindingState* state, const char * fileName) { GLBindingState * glState = (GLBindingState*)state; - FILE * f = fopen(fileName, "wt"); + FILE * f; + fopen_s(&f, fileName, "wt"); for (auto & entry : glState->entries) { if (entry.isOutput) |